Merge pull request #1 from siddii/master

1.3.5

Author: juan9118

.travis.yml

@@ -5,10 +5,10 @@ node_js:
 notifications:
   email: true
 
-before_script:
+install:
+  - npm install
   - npm install -g grunt-cli
   - npm install bower
   - bower install
-
 script:
   - grunt tests

app/js/_timer.js

@@ -114,7 +114,7 @@ var timerModule = angular.module('timer', [])
           }
         });
 
-        $scope.start = $element[0].start = function () {
+        $scope.start = function () {
           $scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
           $scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
           if (!angular.isNumber($scope.countdown)) {
@@ -123,40 +123,71 @@ var timerModule = angular.module('timer', [])
           resetTimeout();
           tick();
           $scope.isRunning = true;
+          $scope.$emit('timer-started', {
+            timeoutId: $scope.timeoutId,
+            millis: $scope.millis,
+            seconds: $scope.seconds,
+            minutes: $scope.minutes,
+            hours: $scope.hours,
+            days: $scope.days
+          });
         };
 
-        $scope.resume = $element[0].resume = function () {
+        $scope.resume = function () {
           resetTimeout();
           if ($scope.countdownattr) {
             $scope.countdown += 1;
           }
           $scope.startTime = moment().diff((moment($scope.stoppedTime).diff(moment($scope.startTime))));
           tick();
           $scope.isRunning = true;
+          $scope.$emit('timer-started', {
+            timeoutId: $scope.timeoutId,
+            millis: $scope.millis,
+            seconds: $scope.seconds,
+            minutes: $scope.minutes,
+            hours: $scope.hours,
+            days: $scope.days
+          });
         };
 
-        $scope.stop = $scope.pause = $element[0].stop = $element[0].pause = function () {
+        $scope.stop = $scope.pause = function () {
           var timeoutId = $scope.timeoutId;
           $scope.clear();
-          $scope.$emit('timer-stopped', {timeoutId: timeoutId, 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 () {
+        $scope.clear = function () {
           // same as stop but without the event being triggered
           $scope.stoppedTime = moment();
           resetTimeout();
           $scope.timeoutId = null;
           $scope.isRunning = false;
         };
 
-        $scope.reset = $element[0].reset = function () {
+        $scope.reset = function () {
           $scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
           $scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
           $scope.countdown = angular.isNumber($scope.countdownattr) && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
           resetTimeout();
           tick();
           $scope.isRunning = false;
           $scope.clear();
+          $scope.$emit('timer-reset', {
+            timeoutId: timeoutId,
+            millis: $scope.millis,
+            seconds: $scope.seconds,
+            minutes: $scope.minutes,
+            hours: $scope.hours,
+            days: $scope.days
+          });
         };
 
         $element.bind('$destroy', function () {
@@ -249,18 +280,15 @@ var timerModule = angular.module('timer', [])
         if ($scope.countdownattr) {
           $scope.millis = $scope.countdownattr * 1000;
 
-          $scope.addCDSeconds = $element[0].addCDSeconds = function (extraSeconds) {
+          $scope.addCDSeconds = function (extraSeconds) {
             $scope.countdown += extraSeconds;
-            $scope.$digest();
             if (!$scope.isRunning) {
               $scope.start();
             }
           };
 
           $scope.$on('timer-add-cd-seconds', function (e, extraSeconds) {
-            $timeout(function () {
-              $scope.addCDSeconds(extraSeconds);
-            });
+             $scope.addCDSeconds(extraSeconds);
           });
 
           $scope.$on('timer-set-countdown-seconds', function (e, countdownSeconds) {
@@ -310,7 +338,14 @@ var timerModule = angular.module('timer', [])
             $scope.$digest();
           }, $scope.interval - adjustment);
 
-          $scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis, timerElement: $element[0]});
+          $scope.$emit('timer-tick', {
+            timeoutId: $scope.timeoutId,
+            millis: $scope.millis,
+            seconds: $scope.seconds,
+            minutes: $scope.minutes,
+            hours: $scope.hours,
+            days: $scope.days
+          });
 
           if ($scope.countdown > 0) {
             $scope.countdown--;
@@ -337,7 +372,50 @@ var timerModule = angular.module('timer', [])
         }
       }]
     };
-    }]);
+  }])
+  .directive('timerControls', function() {
+    return {
+      restrict: 'EA',
+      scope: true,
+      controller: ['$scope', function($scope) {
+        $scope.timerStatus = "reset";
+        $scope.$on('timer-started', function() {
+          $scope.timerStatus = "started";
+        });
+        $scope.$on('timer-stopped', function() {
+          $scope.timerStatus = "stopped";
+        });
+        $scope.$on('timer-reset', function() {
+          $scope.timerStatus = "reset";
+        });
+        $scope.timerStart = function() {
+          $scope.$broadcast('timer-start');
+        };
+        $scope.timerStop = function() {
+          $scope.$broadcast('timer-stop');
+        };
+        $scope.timerResume = function() {
+          $scope.$broadcast('timer-resume');
+        };
+        $scope.timerToggle = function() {
+          switch ($scope.timerStatus) {
+            case "started":
+              $scope.timerStop();
+              break;
+            case "stopped":
+              $scope.timerResume();
+              break;
+            case "reset":
+              $scope.timerStart();
+              break;
+          }
+        };
+        $scope.timerAddCDSeconds = function(extraSeconds) {
+          $scope.$broadcast('timer-add-cd-seconds', extraSeconds);
+        };
+      }]
+    };
+  });
 
 /* commonjs package manager support (eg componentjs) */
 if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){

app/js/i18nService.js

@@ -22,7 +22,7 @@ app.factory('I18nService', function() {
         }
 
         //moment init
-        moment.locale(this.language); //@TODO maybe to remove, it should be handle by the user's application itself, and not inside the directive
+        moment.locale(this.language); // @TODO maybe to remove, it should be handle by the user's application itself, and not inside the directive
 
         //human duration init, using it because momentjs does not allow accurate time (
         // momentJS: a few moment ago, human duration : 4 seconds ago

bower.json

@@ -1,7 +1,7 @@
 {
-  "author": "Siddique Hameed",
+  "author": "Adrian Wardell",
   "name": "angular-timer",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "homepage": "https://github.com/siddii/angular-timer",
   "description": "Angular-Timer : A simple AngularJS directive demonstrating re-usability & interoperability",
   "repository": {