mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-10-29 18:00:23 +00:00
Updated look of remote on mobile, and fixed changing channel remotely
This commit is contained in:
@@ -104,7 +104,7 @@
|
|||||||
<ul class="collapsible collapsible-accordion">
|
<ul class="collapsible collapsible-accordion">
|
||||||
<li>
|
<li>
|
||||||
<a class="collapsible-header bold waves-effect">Remote Control
|
<a class="collapsible-header bold waves-effect">Remote Control
|
||||||
<i class="mdi-action-account-circle"></i>
|
<i class="material-icons">settings_remote</i>
|
||||||
</a>
|
</a>
|
||||||
<div class="collapsible-body">
|
<div class="collapsible-body">
|
||||||
<ul>
|
<ul>
|
||||||
@@ -155,15 +155,16 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="no-padding hide-on-large-only">
|
<li class="no-padding show-only-mobile">
|
||||||
<ul class="collapsible collapsible-accordion">
|
<ul class="collapsible collapsible-accordion">
|
||||||
<li>
|
<li>
|
||||||
<a class="collapsible-header bold waves-effect import-a">Remote Controller
|
<a class="collapsible-header bold waves-effect import-a">Remote Controller
|
||||||
<i class="mdi-communication-import-export"></i>
|
<i class="material-icons">settings_remote</i>
|
||||||
</a>
|
</a>
|
||||||
<div class="collapsible-body">
|
<div class="collapsible-body">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="white-bg">
|
<li class="white-bg">
|
||||||
|
<p id="remote_header">Control another client</p>
|
||||||
<form action="#" class="row" id="remoteform">
|
<form action="#" class="row" id="remoteform">
|
||||||
<div class="input-field col s12">
|
<div class="input-field col s12">
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -1318,6 +1318,8 @@ nav ul li:hover, nav ul li.active {
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
.mobile-search{display:none;}
|
.mobile-search{display:none;}
|
||||||
|
.show-only-mobile{display:none;
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 736px) and (max-width:600px), only screen and (max-device-width: 736px) and (orientation: landscape){
|
@media only screen and (max-width: 736px) and (max-width:600px), only screen and (max-device-width: 736px) and (orientation: landscape){
|
||||||
#playbar{
|
#playbar{
|
||||||
@@ -1331,6 +1333,19 @@ nav ul li:hover, nav ul li.active {
|
|||||||
|
|
||||||
#remote_channel{
|
#remote_channel{
|
||||||
color:#2d2d2d;
|
color:#2d2d2d;
|
||||||
|
width:90%;
|
||||||
|
}
|
||||||
|
.show-only-mobile{display:block;}
|
||||||
|
|
||||||
|
#volume-control-remote{
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#remote_header{
|
||||||
|
color: #2d2d2d;
|
||||||
|
font-size: 1.5em;
|
||||||
|
padding: 10px;
|
||||||
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
#all_chat, #channelchat{
|
#all_chat, #channelchat{
|
||||||
|
|||||||
4
static/dist/main.min.js
vendored
4
static/dist/main.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -24,6 +24,7 @@ var Hostcontroller = {
|
|||||||
began = true;
|
began = true;
|
||||||
socket.on(id, function(arr)
|
socket.on(id, function(arr)
|
||||||
{
|
{
|
||||||
|
|
||||||
if(enabled){
|
if(enabled){
|
||||||
if(arr[0] == "volume"){
|
if(arr[0] == "volume"){
|
||||||
$("#volume").slider("value", arr[1]);
|
$("#volume").slider("value", arr[1]);
|
||||||
@@ -31,6 +32,7 @@ var Hostcontroller = {
|
|||||||
localStorage.setItem("volume", arr[1]);
|
localStorage.setItem("volume", arr[1]);
|
||||||
Playercontrols.choose_button(arr[1], false);
|
Playercontrols.choose_button(arr[1], false);
|
||||||
}else if(arr[0] == "channel"){
|
}else if(arr[0] == "channel"){
|
||||||
|
console.log("changing channel");
|
||||||
socket.emit("change_channel");
|
socket.emit("change_channel");
|
||||||
Admin.beginning = true;
|
Admin.beginning = true;
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ $().ready(function(){
|
|||||||
function init(){
|
function init(){
|
||||||
|
|
||||||
chan = $("#chan").html();
|
chan = $("#chan").html();
|
||||||
console.log(chan);
|
|
||||||
mobile_beginning = window.mobilecheck();
|
mobile_beginning = window.mobilecheck();
|
||||||
var side = window.mobilecheck() ? "left" : "right";
|
var side = window.mobilecheck() ? "left" : "right";
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ var Mobile_remote = {
|
|||||||
id: "",
|
id: "",
|
||||||
|
|
||||||
get_input: function(value) {
|
get_input: function(value) {
|
||||||
console.log(value, Mobile_remote.id);
|
|
||||||
if(Mobile_remote.id == "") {
|
if(Mobile_remote.id == "") {
|
||||||
Mobile_remote.set_id(value);
|
Mobile_remote.set_id(value);
|
||||||
} else {
|
} else {
|
||||||
@@ -11,7 +10,6 @@ var Mobile_remote = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
set_id: function(id) {
|
set_id: function(id) {
|
||||||
console.log(id);
|
|
||||||
Mobile_remote.id = id;
|
Mobile_remote.id = id;
|
||||||
$("#pausebutton_remote").attr("disabled", false);
|
$("#pausebutton_remote").attr("disabled", false);
|
||||||
$("#skipbutton_remote").attr("disabled", false);
|
$("#skipbutton_remote").attr("disabled", false);
|
||||||
@@ -19,10 +17,12 @@ var Mobile_remote = {
|
|||||||
$("#skipbutton_remote").attr("disabled", false);
|
$("#skipbutton_remote").attr("disabled", false);
|
||||||
$("#remote_channel").val("");
|
$("#remote_channel").val("");
|
||||||
$("#remote_channel").attr("placeholder", "Change channel");
|
$("#remote_channel").attr("placeholder", "Change channel");
|
||||||
|
$("#remote_header").html("Controlling " + id);
|
||||||
|
$("#volume-control-remote").css("display", "block");
|
||||||
},
|
},
|
||||||
|
|
||||||
set_channel: function(channel_name) {
|
set_channel: function(channel_name) {
|
||||||
socket.emit("id", [id, "channel", channel_name]);
|
socket.emit("id", [Mobile_remote.id, "channel", channel_name]);
|
||||||
},
|
},
|
||||||
|
|
||||||
play_remote: function() {
|
play_remote: function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user