timer-stopped event returning timeoutId as arg

mehdichamouma · May 17, 2014 · d6e00b6 · d6e00b6
1 parent d34157e
commit d6e00b6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/app/js/timer.js b/app/js/timer.js
@@ -86,8 +86,9 @@ angular.module('timer', [])
         };
 
         $scope.stop = $scope.pause = $element[0].stop = $element[0].pause = function () {
+          var timeoutId = $scope.timeoutId;
           $scope.clear();
-          $scope.$emit('timer-stopped', {millis: $scope.millis, seconds: $scope.seconds, minutes: $scope.minutes, hours: $scope.hours, days: $scope.days});
+          $scope.$emit('timer-stopped', {timeoutId: timeoutId, millis: $scope.millis, seconds: $scope.seconds, minutes: $scope.minutes, hours: $scope.hours, days: $scope.days});
         };
 
         $scope.clear = $element[0].clear = function () {

diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.1.0 - 2014-04-23 5:44 AM
+ * angular-timer - v1.1.0 - 2014-05-16 7:22 PM
  * https://github.com/siddii/angular-timer
  *
  * Copyright (c) 2014 Siddique Hameed
@@ -93,8 +93,9 @@ angular.module('timer', [])
         };
 
         $scope.stop = $scope.pause = $element[0].stop = $element[0].pause = function () {
+          var timeoutId = $scope.timeoutId;
           $scope.clear();
-          $scope.$emit('timer-stopped', {millis: $scope.millis, seconds: $scope.seconds, minutes: $scope.minutes, hours: $scope.hours, days: $scope.days});
+          $scope.$emit('timer-stopped', {timeoutId: timeoutId, millis: $scope.millis, seconds: $scope.seconds, minutes: $scope.minutes, hours: $scope.hours, days: $scope.days});
         };
 
         $scope.clear = $element[0].clear = function () {
@@ -164,6 +165,16 @@ angular.module('timer', [])
               $scope.addCDSeconds(extraSeconds);
             });
           });
+
+          $scope.$on('timer-set-countdown-seconds', function(e, countdownSeconds) {
+            if (!$scope.isRunning) {
+              $scope.clear();
+            }
+
+            $scope.countdown = countdownSeconds;
+            $scope.millis = countdownSeconds * 1000;
+            calculateTimeUnits();
+          });
         } else {
           $scope.millis = 0;
         }

diff --git a/dist/angular-timer.min.js b/dist/angular-timer.min.js
diff --git a/examples/angularjs-multiple-timers.html b/examples/angularjs-multiple-timers.html
@@ -18,6 +18,10 @@
                 $scope.$broadcast('timer-stop');
                 $scope.timerRunning = false;
             };
+
+            $scope.$on('timer-stopped', function (event, args) {
+                console.log('timer-stopped args = ', args);
+            });
         }
         MyAppController.$inject = ['$scope'];
     </script>