Merge branch 'master' of https://github.com/siddii/angular-timer

siddii · Mar 9, 2017 · 8fe172e · 8fe172e
2 parents ad3c984 + a67196a
commit 8fe172e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/app/js/_timer.js b/app/js/_timer.js
@@ -334,8 +334,10 @@ var timerModule = angular.module('timer', [])
 
           //We are not using $timeout for a reason. Please read here - https://github.com/siddii/angular-timer/pull/5
           $scope.timeoutId = setTimeout(function () {
-            tick();
-            $scope.$digest();
+              tick();
+              // since you choose not to use $timeout, at least preserve angular cycle two way data binding
+              // by calling $scope.$apply() instead of $scope.$digest()
+              $scope.$apply();
           }, $scope.interval - adjustment);
 
           $scope.$emit('timer-tick', {

diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.3.5 - 2017-02-15 4:36 PM
+ * angular-timer - v1.3.5 - 2017-03-09 11:42 AM
  * https://github.com/siddii/angular-timer
  *
  * Copyright (c) 2017 Adrian Wardell
@@ -341,8 +341,10 @@ var timerModule = angular.module('timer', [])
 
           //We are not using $timeout for a reason. Please read here - https://github.com/siddii/angular-timer/pull/5
           $scope.timeoutId = setTimeout(function () {
-            tick();
-            $scope.$digest();
+              tick();
+              // since you choose not to use $timeout, at least preserve angular cycle two way data binding
+              // by calling $scope.$apply() instead of $scope.$digest()
+              $scope.$apply();
           }, $scope.interval - adjustment);
 
           $scope.$emit('timer-tick', {

diff --git a/dist/angular-timer.min.js b/dist/angular-timer.min.js