v1.2.1

siddii · Feb 25, 2015 · 423657e · 423657e
1 parent 69838cb
commit 423657e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "author": "Siddique Hameed",
   "name": "angular-timer",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/siddii/angular-timer",
   "description": "Angular-Timer : A simple AngularJS directive demonstrating re-usability & interoperability",
   "repository": {

diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,8 +1,8 @@
 /**
- * angular-timer - v1.2.0 - 2014-12-15 6:34 PM
+ * angular-timer - v1.2.1 - 2015-02-25 4:19 PM
  * https://github.com/siddii/angular-timer
  *
- * Copyright (c) 2014 Siddique Hameed
+ * Copyright (c) 2015 Siddique Hameed
  * Licensed MIT <https://github.com/siddii/angular-timer/blob/master/LICENSE.txt>
  */
 var timerModule = angular.module('timer', [])
@@ -19,7 +19,7 @@ var timerModule = angular.module('timer', [])
         autoStart: '&autoStart',
         maxTimeUnit: '='
       },
-      controller: ['$scope', '$element', '$attrs', '$timeout', function ($scope, $element, $attrs, $timeout) {
+      controller: ['$scope', '$element', '$attrs', '$timeout', '$interpolate', function ($scope, $element, $attrs, $timeout, $interpolate) {
 
         // Checking for trim function since IE8 doesn't have it
         // If not a function, create tirm with RegEx to mimic native trim
@@ -35,7 +35,7 @@ var timerModule = angular.module('timer', [])
         $scope.autoStart = $attrs.autoStart || $attrs.autostart;
 
         if ($element.html().trim().length === 0) {
-          $element.append($compile('<span>{{millis}}</span>')($scope));
+          $element.append($compile('<span>' + $interpolate.startSymbol() + 'millis' + $interpolate.endSymbol() + '</span>')($scope));
         } else {
           $element.append($compile($element.contents())($scope));
         }
@@ -76,6 +76,12 @@ var timerModule = angular.module('timer', [])
           }
         }
 
+        $scope.$watch('startTimeAttr', function(newValue, oldValue) {
+          if (newValue !== oldValue && $scope.isRunning) {
+            $scope.start();
+          }
+        });
+
         $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;

diff --git a/dist/angular-timer.min.js b/dist/angular-timer.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Siddique Hameed",
   "name": "angular-timer",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/siddii/angular-timer",
   "main":"dist/angular-timer.js",
   "licenses": {