Fixed volume and channellogin on channelchange remotely

This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-10 13:07:15 +01:00
parent f1f265a69c
commit 5b713d33aa
3 changed files with 6 additions and 9 deletions

View File

@@ -5,6 +5,7 @@
<div class="modal-content"> <div class="modal-content">
<h4>Want to contact us?</h4> <h4>Want to contact us?</h4>
<div id="contact-container"> <div id="contact-container">
<a href="mailto"
<form id="contact-form" method="post" onsubmit="return false;"> <form id="contact-form" method="post" onsubmit="return false;">
<input id="contact-form-from" name="from" type="email" placeholder="your@mail.com" autocomplete="off" class="validate"> <input id="contact-form-from" name="from" type="email" placeholder="your@mail.com" autocomplete="off" class="validate">
<input id="contact-form-message" name="message" type="text" placeholder="Your message to us..." autocomplete="off"> <input id="contact-form-message" name="message" type="text" placeholder="Your message to us..." autocomplete="off">

File diff suppressed because one or more lines are too long

View File

@@ -27,7 +27,7 @@ var Hostcontroller = {
if(enabled){ if(enabled){
if(arr[0] == "volume"){ if(arr[0] == "volume"){
$("#volume").slider("value", arr[1]); $("#volume").slider("value", arr[1]);
ytplayer.setVolume(arr[1]); Youtube.ytplayer.setVolume(arr[1]);
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"){
@@ -39,12 +39,8 @@ var Hostcontroller = {
w_p = true; w_p = true;
socket.emit("list", chan.toLowerCase()); socket.emit("list", chan.toLowerCase());
if(localStorage[chan.toLowerCase()]){ if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
//localStorage.removeItem(chan.toLowerCase()); socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
if(localStorage[chan.toLowerCase()].length != 64)
localStorage.removeItem(chan.toLowerCase());
else
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]);
} }
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase()); window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());