Issue 35 36

popcorn.sequence.js

@@ -323,7 +323,13 @@
 
     play: function() {
 
-      this.playlist[ this.active ].play();
+      if ( ( ( this.queue.length - 1 ) === this.active ) &&
+           ( this.inOuts[ "ofVideos" ][ this.active ][ "out" ] >= Math.round( this.queue[ this.active ].currentTime ) ) )
+      {
+        this.jumpTo( 0 );
+      } else {
+        this.queue[ this.active ].play();
+      }
 
       return this;
     },
@@ -451,7 +457,7 @@
       return currentTime;
     },
     jumpTo: function( time ) {
-    
+
       if ( time < 0 || time > this.duration() ) {
         return this;
       }

test/sequence.unit.js

@@ -737,17 +737,17 @@ asyncTest("pause() and play()", 3, function() {
   seq.on( "loadedmetadata", function() {
 
     seq.cue( 2, function() {
-                  
+
     equal( seq.playing, true, "Sequence is playing" );
-    
+
     seq.pause();
 
     }).on ("pause", function() {
       seq.off( "pause" );
-    	equal( seq.playing, false, "Sequence is paused" );
-    	seq.play();
+      equal( seq.playing, false, "Sequence is paused" );
+      seq.play();
     }).cue(4,function(){
-    	equal( seq.playing, true, "Sequence is playing again" );
+      equal( seq.playing, true, "Sequence is playing again" );
       seq.remove();
       start();
     });
@@ -756,3 +756,34 @@ asyncTest("pause() and play()", 3, function() {
 });
 
 
+asyncTest( "play() after sequence ended", 2, function() {
+
+  var seq = Popcorn.sequence( "video-sequence-b", remoteMediaList ),
+      ended = 0;
+
+  seq.on( "loadedmetadata", function() {
+
+    seq.on( "pause", function() {
+       if ( seq.currentTime() >= seq.duration() ) {
+
+          if ( !seq.playing ) {
+            ended = 1;
+          }
+
+          seq.play();
+
+          seq.cue( 2, function() {
+
+            start();
+            equal( ended, 1, "Sequence ended" );
+            equal( seq.active, 0, "Sequence cycle started from beginning" );
+            seq.remove();
+            start();
+          })
+        }
+      })
+      seq.play();
+    });
+});
+
+