v1.2.0

siddii · Dec 16, 2014 · 7f4b0dd · 7f4b0dd
1 parent e2581fc
commit 7f4b0dd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.1.9 - 2014-11-23 7:22 PM
+ * angular-timer - v1.2.0 - 2014-12-15 6:34 PM
  * https://github.com/siddii/angular-timer
  *
  * Copyright (c) 2014 Siddique Hameed
@@ -61,7 +61,11 @@ var timerModule = angular.module('timer', [])
         $scope.$on('timer-clear', function () {
           $scope.clear();
         });
-
+
+        $scope.$on('timer-reset', function () {
+          $scope.reset();
+        });
+
         $scope.$on('timer-set-countdown', function (e, countdown) {
           $scope.countdown = countdown;
         });
@@ -107,6 +111,16 @@ var timerModule = angular.module('timer', [])
           $scope.isRunning = false;
         };
 
+        $scope.reset = $element[0].reset = 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;
+          resetTimeout();
+          tick();
+          $scope.isRunning = false;
+          $scope.clear();
+        };
+
         $element.bind('$destroy', function () {
           resetTimeout();
           $scope.isRunning = false;

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.1.9",
+  "version": "1.2.0",
   "homepage": "https://github.com/siddii/angular-timer",
   "main":"dist/angular-timer.js",
   "licenses": {