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

reverting delayed search

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-01-27 15:18:42 +01:00
parent ddbac928b5
commit 0e690c908e
4 changed files with 6 additions and 7 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

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

File diff suppressed because one or more lines are too long

1
static/js/embed.js
View File

@@ -30,7 +30,6 @@ $(document).ready(function(){
console.log(window.location.hash) console.log(window.location.hash)
add = "https://zoff.no"; add = "https://zoff.no";
//add = "localhost";
socket = io.connect(''+add+':8880', connection_options); socket = io.connect(''+add+':8880', connection_options);
socket.on("get_list", function(){ socket.on("get_list", function(){

6
static/js/youtube.js
View File

@@ -172,17 +172,17 @@ var Youtube = {
$("#player").css("opacity", "1"); $("#player").css("opacity", "1");
$("#controls").css("opacity", "1"); $("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1"); $(".playlist").css("opacity", "1");
console.log(video_id);
Youtube.ytplayer.loadVideoById(video_id); Youtube.ytplayer.loadVideoById(video_id);
Youtube.ytplayer.playVideo(); Youtube.ytplayer.playVideo();
Youtube.durationSetter(); Youtube.durationSetter();
if(embed){ /*if(embed){
setTimeout(function(){ setTimeout(function(){
Youtube.ytplayer.playVideo(); Youtube.ytplayer.playVideo();
Youtube.ytplayer.seekTo(seekTo); Youtube.ytplayer.seekTo(seekTo);
console.log("delayed search"); console.log("delayed search");
}, 1000); }, 1000);
}else Youtube.ytplayer.seekTo(seekTo); }else */
Youtube.ytplayer.seekTo(seekTo);
} }
Youtube.readyLooks(); Youtube.readyLooks();
Playercontrols.initYoutubeControls(Youtube.ytplayer); Playercontrols.initYoutubeControls(Youtube.ytplayer);