Merge branch 'master' of github.com:zencoder/video-js

build.sh

@@ -2,6 +2,9 @@
 # Combines Source Files. In terminal, sh build.sh
 # It will put a new video.js file under dist/
 
+# Create dist directory if it doesn't already exist
+mkdir -p dist
+
 # FILES=../src/*
 # for f in $FILES
 # do
@@ -38,4 +41,4 @@ cp flash/video-js.swf dist/video-js.swf
 
 cp build/files/README.md dist/README.md
 cp build/files/demo.html dist/demo.html
-cp LGPLv3-LICENSE.txt dist/LGPLv3-LICENSE.txt
+cp LGPLv3-LICENSE.txt dist/LGPLv3-LICENSE.txt

src/controls.js

@@ -167,6 +167,7 @@ _V_.BigPlayButton = _V_.Button.extend({
   },
 
   onClick: function(){
+    this.player.currentTime(0);
     this.player.play();
   }
 });

src/player.js

@@ -107,7 +107,12 @@ _V_.Player = _V_.Component.extend({
   // Cache for video property values.
   values: {},
 
-  destroy: function(){},
+  destroy: function(){
+    // Ensure that tracking progress and time progress will stop and plater deleted
+    this.stopTrackingProgress();
+    this.stopTrackingCurrentTime();
+    delete _V_.players[this.id]
+  },
 
   createElement: function(type, options){
 

src/tracks.js

@@ -88,7 +88,7 @@ _V_.Track.prototype = {
           // Meaning the user is scrubbing in reverse or rewinding
           reverse = (this.cues[this.lastCueIndex].startTime > time),
           // If reverse, step back 1 becase we know it's not the lastCue
-          i = this.lastCueIndex - (reverse) ? 1 : 0;
+          i = this.lastCueIndex - (reverse ? 1 : 0);
         while (true) { // Loop until broken
           if (reverse) { // Looping in reverse
             // Stop if no more, or this cue ends before the current time (no earlier cues should apply)