Fixed error where sharelinks messed up navigation

This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-12 12:33:06 +01:00
parent dc40b7c5b3
commit dab1b5ef0c
6 changed files with 13 additions and 8 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
File diff suppressed because one or more lines are too long
+8
View File
@@ -282,5 +282,13 @@ var List = {
} }
}); });
return indexes[0]; return indexes[0];
},
scrollTop: function(){
$("#wrapper").scrollTop(0);
},
scrollBottom: function(){
$("#wrapper").scrollTop($("#wrapper")[0].scrollHeight);
} }
} }
+1 -2
View File
@@ -413,6 +413,7 @@ function onepage_load(){
$("#channel-load").css("display", "block"); $("#channel-load").css("display", "block");
window.scrollTo(0, 0); window.scrollTo(0, 0);
Helper.share_link_modifier(false);
Youtube.stopInterval = true; Youtube.stopInterval = true;
Admin.display_logged_out(); Admin.display_logged_out();
@@ -428,8 +429,6 @@ function onepage_load(){
url: "php/nochan.php", url: "php/nochan.php",
success: function(e){ success: function(e){
console.log($(e));
socket.disconnect(); socket.disconnect();
document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video); document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video);
-2
View File
@@ -271,8 +271,6 @@ function initfp(){
} }
} }
Helper.share_link_modifier(false);
channel_list = $("#channel-list-container").html(); channel_list = $("#channel-list-container").html();
var connection_options = { var connection_options = {