Merge pull request #154 from flowplayer/js-controls-improvements

js controls improvements
flowplayer · Dec 9, 2013 · 4f301b0 · 4f301b0
2 parents 793ee05 + fcb093a
commit 4f301b0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/js-plugins/controls/flowplayer.controls.js b/js-plugins/controls/flowplayer.controls.js
@@ -256,7 +256,8 @@
             time.innerHTML = getTime(status.time, clip.duration);
 
 			// buffer width
-			var x = getMax(status.bufferEnd, duration);
+			// assume "filled buffer" for streaming protocols #152
+			var x = getMax(clip.provider == "http" ? status.bufferEnd : duration, duration);
 			bufferBar.style.width = x + "px";
 			head.setMax(x);	
 
@@ -297,6 +298,7 @@
 
 	// clear timer when clip ends	
 	self.onFinish(function(clip) {		
+		play.className = opts.playClass;
 		clearInterval(timer);	
 	});