KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed popstate on channelchange from remote

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-10 13:18:33 +01:00
parent 5b713d33aa
commit 8fffd16aa1
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
static/dist/frontpage.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
static/js/helpers.js
View File

@@ -168,6 +168,10 @@ var Helper = {
return "#" + Helper.componentToHex(r) + Helper.componentToHex(g) + Helper.componentToHex(b);
},
upperFirst: function(string){
return string.substring(0,1).toUpperCase()+string.substring(1).toLowerCase();
},
send_mail: function(from, message){

7
static/js/hostcontroller.js
View File

@@ -32,16 +32,17 @@ var Hostcontroller = {
Playercontrols.choose_button(arr[1], false);
}else if(arr[0] == "channel"){
socket.emit("change_channel");
Admin.beginning = true;
chan = arr[1].toLowerCase();
$("#chan").html(chan.substring(0,1).toUpperCase()+chan.substring(1).toLowerCase());
$("#chan").html(Helper.upperFirst(chan));
w_p = true;
socket.emit("list", chan.toLowerCase());
if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
/*if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
}
}*/
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
}else if(arr[0] == "pause")

12
static/js/listeners.js
View File

@@ -34,7 +34,6 @@ var conf;
var blink_interval;
var tag;
var firstScriptTag;
var ytplayer;
var title;
var viewers;
var video_id;
@@ -399,7 +398,16 @@ function onepage_load(){
var url_split = window.location.href.split("/");
if(url_split[3] == ""){
if(url_split[3] != "#" && url_split[3] != ""){
socket.emit("change_channel");
Admin.beginning = true;
chan = url_split[3].replace("#", "");
$("#chan").html(Helper.upperFirst(chan));
w_p = true;
socket.emit("list", chan.toLowerCase());
}else if(url_split[3] == ""){
$("#channel-load").css("display", "block");
window.scrollTo(0, 0);