Merge branch 'itslenny-master'

Author: siddii

app/js/timer.js

@@ -1,4 +1,4 @@
-var timerModule = angular.module('timer', [])
+angular.module('timer', [])
   .directive('timer', ['$compile', function ($compile) {
     return  {
       restrict: 'EAC',
@@ -8,6 +8,7 @@ var timerModule = angular.module('timer', [])
         startTimeAttr: '=startTime',
         endTimeAttr: '=endTime',
         countdownattr: '=countdown',
+        finishCallback: '&finishCallback',
         autoStart: '&autoStart',
         maxTimeUnit: '='
       },
@@ -219,6 +220,7 @@ var timerModule = angular.module('timer', [])
             $scope.stop();
             $scope.millis = 0;
             calculateTimeUnits();
+            if($scope.finishCallback) $scope.$eval($scope.finishCallback);
             return;
           }
           calculateTimeUnits();
@@ -236,6 +238,7 @@ var timerModule = angular.module('timer', [])
           }
           else if ($scope.countdown <= 0) {
             $scope.stop();
+            if($scope.finishCallback) $scope.$eval($scope.finishCallback);
           }
         };
 

docs/docs.js

@@ -34,4 +34,13 @@ angular.module('timer-demo',['timer']).controller('TimerDemoController',['$scope
             }
         });
     };
+    
+    $scope.callbackTimer={};
+    $scope.callbackTimer.status='Running';
+    $scope.callbackTimer.callbackCount=0;    
+    $scope.callbackTimer.finished=function(){
+        $scope.callbackTimer.status='COMPLETE!!';
+        $scope.callbackTimer.callbackCount++;
+        $scope.$apply();
+    };
 }]);

index.html

@@ -214,6 +214,26 @@ <h3 class="WithoutMaxTimeUnit">
     </div>
 </section>
 
+
+<section id="finish-callback-timer">
+    <h3>Countdown Finished Callback</h3>
+
+    <div class="bs-docs-example">
+        <p>
+            A countdown timer that updates a value once the callback is reached
+            <code ng-non-bindable="">
+            &lt;timer countdown="3" interval="1000" finish-callback="callbackTimer.finished()"&gt;{{seconds}} second{{secondsS}}&lt;/timer&gt;
+            </code>
+
+        <h3 class="counter">
+            <timer countdown="3" interval="1000" finish-callback="callbackTimer.finished()">{{seconds}} second{{secondsS}} </timer>
+        </h3>
+        Timer: <span class="timer-status">{{callbackTimer.status}}</span>
+        Callbacks: <span class="timer-callbacks">{{callbackTimer.callbackCount}}</span>
+
+    </div>
+</section>
+
 <section id="markup">
     <h3>
         Markup</h3>

test/e2e/scenarios.js

@@ -142,6 +142,18 @@ describe('Angular Timer E2E Tests', function () {
     expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 minutes,/);
     expect(element('#clock-timer-leading-zero timer').html()).toMatch(/11 seconds./);
   });
+  
+  it('Countdown finish - Should fire callback on completion', function () {
+  
+    
+    expect(element('#finish-callback-timer .timer-status').html()).toBe('Running');
+    expect(element('#finish-callback-timer .timer-callbacks').html()).toBe('0');
+    
+    sleep(5);
+    expect(element('#finish-callback-timer .timer-status').html()).toBe('COMPLETE!!');    
+    expect(element('#finish-callback-timer .timer-callbacks').html()).toBe('1');    
+    
+  });  
 
   it('Countdown timer with maxTimeUnit- should display time value from lower to specified maxTimeUnit', function() {
     var timer1Val = element('#max-time-unit-countdown-timer .WithMaxTimeUnitAsMinute timer').text();