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 error with durationsetter on embed

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-03-04 14:28:40 +01:00
parent 7c4d1a7d74
commit 6b51534597
5 changed files with 8 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

1
static/js/embed.js
View File

@@ -9,6 +9,7 @@ var embed = true;
var vol = 100; var vol = 100;
var adminpass = ""; var adminpass = "";
var mobile_beginning = false; var mobile_beginning = false;
var durationBegun = false;
var seekTo; var seekTo;
var socket; var socket;

9
static/js/player.js
View File

@@ -66,7 +66,7 @@ var Player = {
if(!paused){ if(!paused){
if(!mobile_beginning) if(!mobile_beginning)
Player.ytplayer.playVideo(); Player.ytplayer.playVideo();
if(!durationBegun || embed) if(!durationBegun)
Player.durationSetter(); Player.durationSetter();
mobile_beginning = false; mobile_beginning = false;
} }
@@ -76,7 +76,7 @@ var Player = {
setTimeout(function(){Player.loaded = true;},500); setTimeout(function(){Player.loaded = true;},500);
}catch(e){ }catch(e){
if(!durationBegun || embed) if(!durationBegun)
Player.durationSetter(); Player.durationSetter();
} }
} }
@@ -176,14 +176,14 @@ var Player = {
try{ try{
beginning = true; beginning = true;
player_ready = true; player_ready = true;
if(!/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) if(!window.MSStream)
{ {
$("#player").css("opacity", "1"); $("#player").css("opacity", "1");
$("#controls").css("opacity", "1"); $("#controls").css("opacity", "1");
$(".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();
if(!durationBegun || embed) if(!durationBegun)
Player.durationSetter(); Player.durationSetter();
if(embed){ if(embed){
setTimeout(function(){ setTimeout(function(){
@@ -277,7 +277,6 @@ var Player = {
/*try{ /*try{
//duration = Player.ytplayer.getDuration(); //duration = Player.ytplayer.getDuration();
}catch(e){};*/ }catch(e){};*/
console.log(duration);
if(duration != undefined){ if(duration != undefined){
try{ try{
durationBegun = true; durationBegun = true;