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

Hopefully fixed error with durationbar and timer

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-03-04 13:49:01 +01:00
parent 76e73d51ac
commit 0cd361d325
4 changed files with 15 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

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

File diff suppressed because one or more lines are too long

1
static/js/listeners.js
View File

@@ -27,6 +27,7 @@ var i = -1;
var lazy_load = true; var lazy_load = true;
var embed = false; var embed = false;
var autoplay = true; var autoplay = true;
var durationBegun = false;
var mobile_beginning; var mobile_beginning;
var timeout_search; var timeout_search;

16
static/js/player.js
View File

@@ -67,7 +67,8 @@ var Player = {
if(!paused){ if(!paused){
if(!mobile_beginning) if(!mobile_beginning)
Player.ytplayer.playVideo(); Player.ytplayer.playVideo();
Player.durationSetter(); if(!durationBegun)
Player.durationSetter();
mobile_beginning = false; mobile_beginning = false;
} }
if(Player.ytplayer.getDuration() > seekTo || Player.ytplayer.getDuration() == 0) if(Player.ytplayer.getDuration() > seekTo || Player.ytplayer.getDuration() == 0)
@@ -75,7 +76,10 @@ var Player = {
Player.after_load = video_id; Player.after_load = video_id;
setTimeout(function(){Player.loaded = true;},500); setTimeout(function(){Player.loaded = true;},500);
}catch(e){Player.durationSetter();} }catch(e){
if(!durationBegun)
Player.durationSetter();
}
} }
else else
Player.getTitle(song_title, viewers); Player.getTitle(song_title, viewers);
@@ -180,7 +184,8 @@ var Player = {
$(".playlist").css("opacity", "1"); $(".playlist").css("opacity", "1");
Player.ytplayer.loadVideoById(video_id); Player.ytplayer.loadVideoById(video_id);
if(autoplay && !window.mobilecheck()) Player.ytplayer.playVideo(); if(autoplay && !window.mobilecheck()) Player.ytplayer.playVideo();
Player.durationSetter(); if(!durationBegun)
Player.durationSetter();
if(embed){ if(embed){
setTimeout(function(){ setTimeout(function(){
Player.ytplayer.seekTo(seekTo); Player.ytplayer.seekTo(seekTo);
@@ -275,13 +280,14 @@ var Player = {
}catch(e){};*/ }catch(e){};*/
if(duration != undefined){ if(duration != undefined){
try{ try{
durationBegun = true;
dMinutes = Math.floor(duration / 60); dMinutes = Math.floor(duration / 60);
dSeconds = duration - dMinutes * 60; dSeconds = duration - dMinutes * 60;
currDurr = Player.ytplayer.getCurrentTime() != undefined ? Player.ytplayer.getCurrentTime() : seekTo; currDurr = Player.ytplayer.getCurrentTime() != undefined ? Math.floor(Player.ytplayer.getCurrentTime()) : seekTo;
if(currDurr > duration) if(currDurr > duration)
currDurr = duration; currDurr = duration;
minutes = Math.floor(currDurr / 60); minutes = Math.floor(currDurr / 60);
seconds = currDurr - minutes * 60; seconds = currDurr - (minutes * 60);
document.getElementById("duration").innerHTML = Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds); document.getElementById("duration").innerHTML = Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds);
per = (100 / duration) * currDurr; per = (100 / duration) * currDurr;
if(per >= 100) if(per >= 100)