Merge remote-tracking branch 'upstream/master'

Conflicts: dist/angular-timer.js dist/angular-timer.min.js
mehdichamouma · May 17, 2014 · 47a2daf · 47a2daf
2 parents 07bbada + 6d59153
commit 47a2daf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 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/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "author": "Siddique Hameed",
   "name": "angular-timer",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "homepage": "https://github.com/siddii/angular-timer",
   "description": "Angular-Timer : A simple AngularJS directive demonstrating re-usability & interoperability",
   "repository": {

diff --git a/dist/README.md b/dist/README.md
@@ -1,5 +1,8 @@
 ##Change Log
 
+###Version 1.1.1
+* Fix for https://github.com/siddii/angular-timer/issues/73
+
 ###Version 1.1.0
 * Plural/singular units. PR - https://github.com/siddii/angular-timer/pull/54
 * IE8 support. PR - https://github.com/siddii/angular-timer/pull/62

diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.1.0 - 2014-05-17 1:35 AM
+ * angular-timer - v1.1.1 - 2014-05-17 3:24 AM
  * 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 () {

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>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Siddique Hameed",
   "name": "angular-timer",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "homepage": "https://github.com/siddii/angular-timer",
   "licenses": {
     "type": "MIT",