addCDSeconds method work even for stopped countdown timers

mehdichamouma · Feb 10, 2014 · a4fbd4d · a4fbd4d
1 parent 42d932b
commit a4fbd4d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/app/js/timer.js b/app/js/timer.js
@@ -58,7 +58,9 @@ angular.module('timer', [])
         $scope.start = $element[0].start = function () {
           $scope.startTime = $scope.startTimeAttr ? new Date($scope.startTimeAttr) : new Date();
           $scope.endTime = $scope.endTimeAttr ? new Date($scope.endTimeAttr) : null;
-          $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
+          if (!$scope.countdown) {
+            $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
+          }
           resetTimeout();
           tick();
           $scope.isRunning = true;
@@ -106,6 +108,9 @@ angular.module('timer', [])
           $scope.addCDSeconds = $element[0].addCDSeconds = function(extraSeconds){
             $scope.countdown += extraSeconds;
             $scope.$digest();
+            if (!$scope.isRunning) {
+              $scope.start();
+            }
           };
 
           $scope.$on('timer-add-cd-seconds', function (e, extraSeconds) {
@@ -154,9 +159,7 @@ angular.module('timer', [])
           }
           else if ($scope.countdown <= 0) {
             $scope.stop();
-            return;
           }
-
         };
 
         if ($scope.autoStart === undefined || $scope.autoStart === true) {

diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.0.12 - 2014-02-03 9:30 PM
+ * angular-timer - v1.0.12 - 2014-02-10 9:05 AM
  * https://github.com/siddii/angular-timer
  *
  * Copyright (c) 2014 Siddique Hameed
@@ -52,6 +52,10 @@ angular.module('timer', [])
           $scope.clear();
         });
 
+        $scope.$on('timer-set-countdown', function (e, countdown) {
+          $scope.countdown = countdown;
+        });
+
         function resetTimeout() {
           if ($scope.timeoutId) {
             clearTimeout($scope.timeoutId);
@@ -61,7 +65,9 @@ angular.module('timer', [])
         $scope.start = $element[0].start = function () {
           $scope.startTime = $scope.startTimeAttr ? new Date($scope.startTimeAttr) : new Date();
           $scope.endTime = $scope.endTimeAttr ? new Date($scope.endTimeAttr) : null;
-          $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
+          if (!$scope.countdown) {
+            $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
+          }
           resetTimeout();
           tick();
           $scope.isRunning = true;
@@ -109,6 +115,9 @@ angular.module('timer', [])
           $scope.addCDSeconds = $element[0].addCDSeconds = function(extraSeconds){
             $scope.countdown += extraSeconds;
             $scope.$digest();
+            if (!$scope.isRunning) {
+              $scope.start();
+            }
           };
 
           $scope.$on('timer-add-cd-seconds', function (e, extraSeconds) {
@@ -143,13 +152,6 @@ angular.module('timer', [])
             return;
           }
           calculateTimeUnits();
-          if ($scope.countdown > 0) {
-            $scope.countdown--;
-          }
-          else if ($scope.countdown <= 0) {
-            $scope.stop();
-            return;
-          }
 
           //We are not using $timeout for a reason. Please read here - https://github.com/siddii/angular-timer/pull/5
           $scope.timeoutId = setTimeout(function () {
@@ -158,6 +160,13 @@ angular.module('timer', [])
           }, $scope.interval - adjustment);
 
           $scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis});
+
+          if ($scope.countdown > 0) {
+            $scope.countdown--;
+          }
+          else if ($scope.countdown <= 0) {
+            $scope.stop();
+          }
         };
 
         if ($scope.autoStart === undefined || $scope.autoStart === true) {

diff --git a/dist/angular-timer.min.js b/dist/angular-timer.min.js
diff --git a/examples/angularjs-add-countdown-seconds.html b/examples/angularjs-add-countdown-seconds.html
@@ -17,7 +17,7 @@
 <body ng-app="MyApp">
     <div ng-controller="MyAppController">
         <h1>AngularJS - Add Countdown Seconds Example</h1>
-        <h3><timer countdown="100" interval="1000">{{countdown}}</timer></h3>
+        <h3><timer countdown="10" interval="1000">{{countdown}}</timer></h3>
         <button ng-click="add5Seconds()">Add 5 Seconds</button>
     </div>
     <br/>