diff --git a/bin/minplayer.compressed.js b/bin/minplayer.compressed.js index d9af4cf..f2d7445 100644 --- a/bin/minplayer.compressed.js +++ b/bin/minplayer.compressed.js @@ -60,7 +60,7 @@ minplayer.players.base.prototype.setupPlayer=function(){this.playerFound()||this break;case 39:case 228:a.seekRelative(0.05)}}}(this))};minplayer.players.base.prototype.addPlayer=function(){this.elements.media&&this.elements.media.remove();this.elements.media=jQuery(this.createPlayer());this.display.html(this.elements.media)};minplayer.players.base.prototype.destroy=function(){minplayer.plugin.prototype.destroy.call(this);this.clear()};minplayer.players.base.prototype.clear=function(){this.playerReady=!1;this.reset();this.player&&(jQuery(this.player).remove(),this.player=null)}; minplayer.players.base.prototype.reset=function(){this.duration=new minplayer.async;this.currentTime=new minplayer.async;this.bytesLoaded=new minplayer.async;this.bytesTotal=new minplayer.async;this.bytesStart=new minplayer.async;this.volume=new minplayer.async;this.loaded=this.loading=this.playing=this.hasFocus=!1;this.trigger("pause",null,!0);this.trigger("waiting",null,!0);this.trigger("progress",{loaded:0,total:0,start:0},!0);this.trigger("timeupdate",{currentTime:0,duration:0},!0)}; minplayer.players.base.prototype.onReady=function(){if(!this.playerReady)if(this.playerReady=!0,this.setVolume(this.options.volume/100),this.loading=!0,this.poll("progress",function(a){return function(){a.loading&&a.getBytesLoaded(function(c){a.getBytesTotal(function(d){if(c||d){var e=0;a.getBytesStart(function(a){e=a});a.trigger("progress",{loaded:c,total:d,start:e});c>=d&&(a.loading=!1)}})});return a.loading}}(this),1E3),this.ready(),this.isReady()){for(var a in this.readyQueue)this.readyQueue[a].call(this); -this.readyQueue.length=0;this.readyQueue=[];this.loaded||this.trigger("loadstart")}else this.readyQueue.length=0,this.readyQueue=[]};minplayer.players.base.prototype.parseTime=function(a){var b=0,c=0,c=0;if(!a)return 0;"string"!=typeof a&&(a=String(a));(b=a.match(/([0-9]+)s/i))&&(b=parseInt(b[1],10));(c=a.match(/([0-9]+)m/i))&&(b+=60*parseInt(c[1],10));(c=a.match(/([0-9]+)h/i))&&(b+=3600*parseInt(c[1],10));b||(b=a.seek);return b}; +this.readyQueue.length=0;this.readyQueue=[];this.loaded||this.trigger("loadstart")}else this.readyQueue.length=0,this.readyQueue=[]};minplayer.players.base.prototype.parseTime=function(a){var b=0,c=0,c=0;if(!a)return 0;"string"!=typeof a&&(a=String(a));(b=a.match(/([0-9]+)s/i))&&(b=parseInt(b[1],10));(c=a.match(/([0-9]+)m/i))&&(b+=60*parseInt(c[1],10));(c=a.match(/([0-9]+)h/i))&&(b+=3600*parseInt(c[1],10));b||(b=a);return b}; minplayer.players.base.prototype.setStartStop=function(){if(this.startTime)return this.startTime;this.startTime=0;minplayer.urlVars&&(this.startTime=this.parseTime(minplayer.urlVars.seek));this.startTime||(this.startTime=this.parseTime(this.options.range.min));this.stopTime=this.options.range.max?this.parseTime(this.options.range.max):0;this.mediaRange=this.stopTime-this.startTime;0>this.mediaRange&&(this.mediaRange=0);return this.startTime}; minplayer.players.base.prototype.onPlaying=function(){this.trigger("playing");this.playing=this.hasFocus=!0;this.poll("timeupdate",function(a){return function(){a.playing&&a.getCurrentTime(function(b){a.getDuration(function(c){b=parseFloat(b);c=parseFloat(c);(b||c)&&a.trigger("timeupdate",{currentTime:b,duration:c})})});return a.playing}}(this),500)};minplayer.players.base.prototype.onPaused=function(){this.trigger("pause");this.playing=this.hasFocus=!1}; minplayer.players.base.prototype.onComplete=function(){if(this.playing)this.onPaused();this.hasFocus=this.loading=this.playing=!1;this.trigger("ended")};minplayer.players.base.prototype.onLoaded=function(){var a=this.loaded;!this.loaded&&this.options.autoplay&&this.play();this.loaded=!0;this.trigger("loadeddata");a||this.getDuration(function(a){return function(c){a.startTime&&a.startTimesrc/minplayer.plugin.js
- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
\ No newline at end of file diff --git a/doc/index.html b/doc/index.html index 897cb2d..8747c76 100644 --- a/doc/index.html +++ b/doc/index.html @@ -347,7 +347,7 @@

minplayer.plugin

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
\ No newline at end of file diff --git a/doc/symbols/_global_.html b/doc/symbols/_global_.html index 5250e94..e34d4e2 100644 --- a/doc/symbols/_global_.html +++ b/doc/symbols/_global_.html @@ -412,7 +412,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/jQuery.fn.minplayer.html b/doc/symbols/jQuery.fn.minplayer.html index adf3c3d..3ca39fb 100644 --- a/doc/symbols/jQuery.fn.minplayer.html +++ b/doc/symbols/jQuery.fn.minplayer.html @@ -345,7 +345,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.async.html b/doc/symbols/minplayer.async.html index 4b915c1..1674d46 100644 --- a/doc/symbols/minplayer.async.html +++ b/doc/symbols/minplayer.async.html @@ -535,7 +535,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.compatibility.html b/doc/symbols/minplayer.compatibility.html index 8748ac6..978ae6a 100644 --- a/doc/symbols/minplayer.compatibility.html +++ b/doc/symbols/minplayer.compatibility.html @@ -604,7 +604,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.display.html b/doc/symbols/minplayer.display.html index df20351..49e9152 100644 --- a/doc/symbols/minplayer.display.html +++ b/doc/symbols/minplayer.display.html @@ -1026,7 +1026,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.file.html b/doc/symbols/minplayer.file.html index 4737998..67d604f 100644 --- a/doc/symbols/minplayer.file.html +++ b/doc/symbols/minplayer.file.html @@ -611,7 +611,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.flags.html b/doc/symbols/minplayer.flags.html index cb5b59f..b57e067 100644 --- a/doc/symbols/minplayer.flags.html +++ b/doc/symbols/minplayer.flags.html @@ -550,7 +550,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.image.html b/doc/symbols/minplayer.image.html index 3f9fa2a..aef0f9d 100644 --- a/doc/symbols/minplayer.image.html +++ b/doc/symbols/minplayer.image.html @@ -677,7 +677,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.base.html b/doc/symbols/minplayer.players.base.html index 3489bda..f168b24 100644 --- a/doc/symbols/minplayer.players.base.html +++ b/doc/symbols/minplayer.players.base.html @@ -2362,7 +2362,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.dailymotion.html b/doc/symbols/minplayer.players.dailymotion.html index c52384c..33cc366 100644 --- a/doc/symbols/minplayer.players.dailymotion.html +++ b/doc/symbols/minplayer.players.dailymotion.html @@ -1443,7 +1443,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.flash.html b/doc/symbols/minplayer.players.flash.html index b7b2bcf..f55a494 100644 --- a/doc/symbols/minplayer.players.flash.html +++ b/doc/symbols/minplayer.players.flash.html @@ -697,7 +697,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.html5.html b/doc/symbols/minplayer.players.html5.html index 80b6286..c31a915 100644 --- a/doc/symbols/minplayer.players.html5.html +++ b/doc/symbols/minplayer.players.html5.html @@ -1308,7 +1308,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.kaltura.html b/doc/symbols/minplayer.players.kaltura.html index 8a97f4e..55da4e6 100644 --- a/doc/symbols/minplayer.players.kaltura.html +++ b/doc/symbols/minplayer.players.kaltura.html @@ -1276,7 +1276,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.limelight.html b/doc/symbols/minplayer.players.limelight.html index cc75952..c15d40a 100644 --- a/doc/symbols/minplayer.players.limelight.html +++ b/doc/symbols/minplayer.players.limelight.html @@ -1084,7 +1084,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.minplayer.html b/doc/symbols/minplayer.players.minplayer.html index 8a6fb4b..1e6689b 100644 --- a/doc/symbols/minplayer.players.minplayer.html +++ b/doc/symbols/minplayer.players.minplayer.html @@ -1124,7 +1124,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.vimeo.html b/doc/symbols/minplayer.players.vimeo.html index 176e026..5ec8703 100644 --- a/doc/symbols/minplayer.players.vimeo.html +++ b/doc/symbols/minplayer.players.vimeo.html @@ -1439,7 +1439,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.players.youtube.html b/doc/symbols/minplayer.players.youtube.html index ed4dd8d..5344a79 100644 --- a/doc/symbols/minplayer.players.youtube.html +++ b/doc/symbols/minplayer.players.youtube.html @@ -1689,7 +1689,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
diff --git a/doc/symbols/minplayer.plugin.html b/doc/symbols/minplayer.plugin.html index 7173877..0d4c7b8 100644 --- a/doc/symbols/minplayer.plugin.html +++ b/doc/symbols/minplayer.plugin.html @@ -1513,7 +1513,7 @@

- Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT) + Documentation generated by JsDoc Toolkit 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
diff --git a/doc/symbols/src/src_minplayer.players.base.js.html b/doc/symbols/src/src_minplayer.players.base.js.html index f233901..d166d53 100644 --- a/doc/symbols/src/src_minplayer.players.base.js.html +++ b/doc/symbols/src/src_minplayer.players.base.js.html @@ -392,7 +392,7 @@ 385 386 // If no seconds were found, then just use the raw value. 387 if (!seconds) { -388 seconds = time.seek; +388 seconds = time; 389 } 390 391 // Return the seconds from the time. diff --git a/src/minplayer.players.base.js b/src/minplayer.players.base.js index 513267f..ba93a61 100644 --- a/src/minplayer.players.base.js +++ b/src/minplayer.players.base.js @@ -385,7 +385,7 @@ minplayer.players.base.prototype.parseTime = function(time) { // If no seconds were found, then just use the raw value. if (!seconds) { - seconds = time.seek; + seconds = time; } // Return the seconds from the time.