Skip to content

Commit

Permalink
Make sure to set the time correctly if it isn't provided.
Browse files Browse the repository at this point in the history
  • Loading branch information
@travist
travist committed Oct 27, 2013
1 parent c1f4f31 commit 6443538
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion bin/minplayer.compressed.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/minplayer.js
View file
Expand Up @@ -2888,7 +2888,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.
Expand Down
2 changes: 1 addition & 1 deletion doc/files.html
View file
Expand Up @@ -460,7 +460,7 @@ <h2><a href="symbols/src/src_minplayer.plugin.js.html">src/minplayer.plugin.js</
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/index.html
View file
Expand Up @@ -347,7 +347,7 @@ <h2><a href="symbols/minplayer.plugin.html">minplayer.plugin</a></h2>
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/_global_.html
View file
Expand Up @@ -412,7 +412,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jQuery.fn.minplayer.html
View file
Expand Up @@ -345,7 +345,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.async.html
View file
Expand Up @@ -535,7 +535,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.compatibility.html
View file
Expand Up @@ -604,7 +604,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.display.html
View file
Expand Up @@ -1026,7 +1026,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.file.html
View file
Expand Up @@ -611,7 +611,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.flags.html
View file
Expand Up @@ -550,7 +550,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.image.html
View file
Expand Up @@ -677,7 +677,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.base.html
View file
Expand Up @@ -2362,7 +2362,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.dailymotion.html
View file
Expand Up @@ -1443,7 +1443,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.flash.html
View file
Expand Up @@ -697,7 +697,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.html5.html
View file
Expand Up @@ -1308,7 +1308,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.kaltura.html
View file
Expand Up @@ -1276,7 +1276,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.limelight.html
View file
Expand Up @@ -1084,7 +1084,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.minplayer.html
View file
Expand Up @@ -1124,7 +1124,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.vimeo.html
View file
Expand Up @@ -1439,7 +1439,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:12 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.players.youtube.html
View file
Expand Up @@ -1689,7 +1689,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/minplayer.plugin.html
View file
Expand Up @@ -1513,7 +1513,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:40:55 GMT-0500 (CDT)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Sun Oct 27 2013 12:58:13 GMT-0500 (CDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/src/src_minplayer.players.base.js.html
View file
Expand Up @@ -392,7 +392,7 @@
<span class='line'>385</span>
<span class='line'>386</span> </span><span class="WHIT"> </span><span class="COMM">// If no seconds were found, then just use the raw value.</span><span class="WHIT">
<span class='line'>387</span> </span><span class="WHIT"> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="NAME">seconds</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
<span class='line'>388</span> </span><span class="WHIT"> </span><span class="NAME">seconds</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">time.seek</span><span class="PUNC">;</span><span class="WHIT">
<span class='line'>388</span> </span><span class="WHIT"> </span><span class="NAME">seconds</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">time</span><span class="PUNC">;</span><span class="WHIT">
<span class='line'>389</span> </span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
<span class='line'>390</span>
<span class='line'>391</span> </span><span class="WHIT"> </span><span class="COMM">// Return the seconds from the time.</span><span class="WHIT">
Expand Down
2 changes: 1 addition & 1 deletion src/minplayer.players.base.js
View file
Expand Up @@ -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.
Expand Down

0 comments on commit 6443538

Please sign in to comment.