In duration situation the ticks data is decreased by 1 on every tick.

#90
pisi · Oct 12, 2012 · 5388ed9 · 5388ed9
1 parent 2b38be8
commit 5388ed9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/jquery.reel.js b/jquery.reel.js
@@ -1603,7 +1603,9 @@ jQuery.reel || (function($, window, document, undefined){
                     var
                       direction= get(_cwish_) * negative_when(1, get(_backwards_)),
                       step= (!get(_playing_) ? velocity : abs(get(_speed_)) + velocity) / leader(_tempo_),
-                      fraction= set(_fraction_, get(_fraction_) - step * direction)
+                      ticks= get(_ticks_),
+                      fraction= set(_fraction_, get(_fraction_) - step * direction),
+                      ticks= opt.duration && ticks > 0 && set(_ticks_, ticks - 1)
                   },
 
                   // This handler performs the opening animation duty when during it the normal animation

diff --git a/test/unit/animation.js b/test/unit/animation.js
@@ -239,4 +239,33 @@
 
   });
 
+  asyncTest( 'Duration: Ticks count down to zero', function()
+  {
+    var
+      ticks_start,
+      expected,
+      samples= 5,
+      $reel= $('#image').reel({
+        speed: 1,
+        duration: 2
+      })
+
+    expect(samples);
+
+    $(document).bind('tick.reel.test', function(){
+      var
+        ticks= $reel.reel('ticks')
+
+      if (ticks != -1){
+        if (!ticks_start){
+          ticks_start= expected= ticks;
+        }else{
+          equal( ticks, --expected, ticks);
+          if (ticks <= ticks_start - samples) start();
+        }
+      }
+    })
+
+  });
+
 })(jQuery);