Permalink
Browse files

Fixed some errors in the limelight player, and also fixed some css an…

…d auto seek.
  • Loading branch information...
1 parent 36fad14 commit 186166b39363af46be409ff87f0243cddc16517c @travist committed Nov 6, 2013
Oops, something went wrong.
View
@@ -2936,6 +2936,19 @@ minplayer.players.base.prototype.setStartStop = function() {
*/
minplayer.players.base.prototype.onPlaying = function() {
+ // See if we need to autoseek.
+ if (!this.playing) {
+ var self = this;
+ this.getDuration(function(duration) {
+ if (self.startTime && (self.startTime < duration)) {
+ self.seek(self.startTime, null, true);
+ if (self.options.autoplay) {
+ self.play();
+ }
+ }
+ });
+ }
+
// Trigger an event that we are playing.
this.trigger('playing');
@@ -3030,20 +3043,6 @@ minplayer.players.base.prototype.onLoaded = function() {
// Trigger this event.
this.trigger('loadeddata');
-
- // See if they would like to seek.
- if (!isLoaded) {
- this.getDuration((function(player) {
- return function(duration) {
- if (player.startTime && (player.startTime < duration)) {
- player.seek(player.startTime, null, true);
- if (player.options.autoplay) {
- player.play();
- }
- }
- };
- })(this));
- }
};
/**
@@ -3337,7 +3336,7 @@ minplayer.players.base.prototype.getCurrentTime = function(callback) {
self.onComplete();
});
}
- currentTime -= self.startTime;
+ currentTime -= self.offsetTime;
callback(currentTime);
});
};
@@ -5588,7 +5587,7 @@ minplayer.players.limelight.prototype.onMediaUpdate = function(event, data) {
return;
}
- this.shouldSeek = (this.getSeek() > 0);
+ this.shouldSeek = (this.startTime > 0);
this.onLoaded();
break;
View
@@ -460,7 +460,7 @@ <h1 class="classTitle">File Index</h1>
</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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
View
@@ -347,7 +347,7 @@ <h1 class="classTitle">Class Index</h1>
</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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -529,7 +529,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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
@@ -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 Mon Nov 04 2013 23:20:53 GMT-0600 (CST)
+ Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Nov 05 2013 22:24:28 GMT-0600 (CST)
</div>
</body>
</html>
Oops, something went wrong.

0 comments on commit 186166b

Please sign in to comment.