Merge pull request siddii#227 from oc-digital/master

Adds timerElement to returned arguments object of ‘timer-tick’

Author: siddii

app/js/_timer.js

@@ -18,13 +18,13 @@ var timerModule = angular.module('timer', [])
         hours: '=?',
         days: '=?',
         months: '=?',
-        years: '=?',   
+        years: '=?',
         secondsS: '=?',
         minutesS: '=?',
         hoursS: '=?',
         daysS: '=?',
         monthsS: '=?',
-        yearsS: '=?'   
+        yearsS: '=?'
       },
       controller: ['$scope', '$element', '$attrs', '$timeout', 'I18nService', '$interpolate', 'progressBarService', function ($scope, $element, $attrs, $timeout, I18nService, $interpolate, progressBarService) {
 
@@ -310,7 +310,7 @@ var timerModule = angular.module('timer', [])
             $scope.$digest();
           }, $scope.interval - adjustment);
 
-          $scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis});
+          $scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis, timerElement: $element[0]});
 
           if ($scope.countdown > 0) {
             $scope.countdown--;

dist/angular-timer.js

@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.3.3 - 2015-08-17 4:25 PM
+ * angular-timer - v1.3.3 - 2015-11-30 10:57 AM
  * https://github.com/siddii/angular-timer
  *
  * Copyright (c) 2015 Siddique Hameed
@@ -19,19 +19,19 @@ var timerModule = angular.module('timer', [])
         autoStart: '&autoStart',
         language: '@?',
         fallback: '@?',
-        maxTimeUnit: '=?',
+        maxTimeUnit: '=',
         seconds: '=?',
         minutes: '=?',
         hours: '=?',
         days: '=?',
         months: '=?',
-        years: '=?',   
+        years: '=?',
         secondsS: '=?',
         minutesS: '=?',
         hoursS: '=?',
         daysS: '=?',
         monthsS: '=?',
-        yearsS: '=?'   
+        yearsS: '=?'
       },
       controller: ['$scope', '$element', '$attrs', '$timeout', 'I18nService', '$interpolate', 'progressBarService', function ($scope, $element, $attrs, $timeout, I18nService, $interpolate, progressBarService) {
 
@@ -76,7 +76,7 @@ var timerModule = angular.module('timer', [])
         $scope.startTime = null;
         $scope.endTime = null;
         $scope.timeoutId = null;
-        $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) >= 0 ? parseInt($scope.countdownattr, 10) : undefined;
+        $scope.countdown = angular.isNumber($scope.countdownattr) && parseInt($scope.countdownattr, 10) >= 0 ? parseInt($scope.countdownattr, 10) : undefined;
         $scope.isRunning = false;
 
         $scope.$on('timer-start', function () {
@@ -124,8 +124,8 @@ var timerModule = angular.module('timer', [])
         $scope.start = $element[0].start = function () {
           $scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
           $scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
-          if (!$scope.countdown) {
-            $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
+          if (!angular.isNumber($scope.countdown)) {
+            $scope.countdown = angular.isNumber($scope.countdownattr) && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
           }
           resetTimeout();
           tick();
@@ -159,7 +159,7 @@ var timerModule = angular.module('timer', [])
         $scope.reset = $element[0].reset = function () {
           $scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
           $scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
-          $scope.countdown = $scope.countdownattr && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
+          $scope.countdown = angular.isNumber($scope.countdownattr) && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
           resetTimeout();
           tick();
           $scope.isRunning = false;
@@ -317,7 +317,7 @@ var timerModule = angular.module('timer', [])
             $scope.$digest();
           }, $scope.interval - adjustment);
 
-          $scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis});
+          $scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis, timerElement: $element[0]});
 
           if ($scope.countdown > 0) {
             $scope.countdown--;