merge

Author: Paul Leclercq

.gitignore

@@ -5,4 +5,4 @@ logs/*
 build/
 .DS_Store
 /node_modules/
-*.log
+*.log

.travis.yml

@@ -7,6 +7,8 @@ notifications:
 
 before_script:
   - npm install -g grunt-cli
+  - npm install bower
+  - bower install
 
 script:
   - grunt tests

dist/CHANGELOG.md renamed to CHANGELOG.md

@@ -1,4 +1,4 @@
-##Change Log
+-##Change Log
 
 ###Version 1.2.0
 * Reset method https://github.com/siddii/angular-timer/pull/46
@@ -63,4 +63,4 @@
 * 'auto-start' attribute name change to 'autostart' in support of Angular 1.2. See #14
 
 ###Version 1.0.3
-* Successful Bower integration!
+* Successful Bower integration!

Gruntfile.js

@@ -36,7 +36,7 @@ module.exports = function (grunt) {
           banner: '<%= meta.banner %>'
         },
         src: [
-          'app/**/*.js'
+           'app/**/*.js'
         ],
         dest: '<%= dist_dir %>/<%= pkg.name %>.js'
       }

README.md

@@ -7,7 +7,19 @@ With any of the following options...
 * Install angular-timer using [Bower](http://bower.io) - `bower install angular-timer`
 * Add ``timer`` to your list of modules
 
+### Requirements
+With Bower install :
+* Install humanize-duration using [Bower](http://bower.io) - `bower install humanize-duration`
+* Install momentjs using [Bower](http://bower.io) - `bower install momentjs`
+
+And include these scripts in your webpage :
+* bower_components/momentjs/min/moment.min.js
+* bower_components/momentjs/min/locales.min.js
+* bower_components/humanize-duration/humanize-duration.js
+
+
 ### Running locally
+Install all bower components - `bower install`
 Using [Grunt](http://gruntjs.com/) type `grunt` from command line, the default task will open index.html page in your
 default browser
 

app/js/timer.js renamed to app/js/_timer.js

@@ -10,9 +10,10 @@ var timerModule = angular.module('timer', [])
         countdownattr: '=countdown',
         finishCallback: '&finishCallback',
         autoStart: '&autoStart',
+        language: '@?',
         maxTimeUnit: '='
       },
-      controller: ['$scope', '$element', '$attrs', '$timeout', '$interpolate', function ($scope, $element, $attrs, $timeout, $interpolate) {
+      controller: ['$scope', '$element', '$attrs', '$timeout', 'I18nService', '$interpolate', function ($scope, $element, $attrs, $timeout, I18nService, $interpolate) {
 
         // Checking for trim function since IE8 doesn't have it
         // If not a function, create tirm with RegEx to mimic native trim
@@ -27,6 +28,18 @@ var timerModule = angular.module('timer', [])
         //backward and forward compatibility.
         $scope.autoStart = $attrs.autoStart || $attrs.autostart;
 
+
+        $scope.language = $scope.language || 'en';
+
+        //allow to change the language of the directive while already launched
+        $scope.$watch('language', function() {
+            i18nService.init($scope.language);
+        });
+
+        //init momentJS i18n, default english
+        var i18nService = new I18nService();
+        i18nService.init($scope.language);
+
         if ($element.html().trim().length === 0) {
           $element.append($compile('<span>' + $interpolate.startSymbol() + 'millis' + $interpolate.endSymbol() + '</span>')($scope));
         } else {
@@ -54,11 +67,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;
         });
@@ -76,8 +89,8 @@ var timerModule = angular.module('timer', [])
         });
 
         $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;
+          $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;
           }
@@ -91,7 +104,7 @@ var timerModule = angular.module('timer', [])
           if ($scope.countdownattr) {
             $scope.countdown += 1;
           }
-          $scope.startTime = new Date() - ($scope.stoppedTime - $scope.startTime);
+          $scope.startTime = moment().diff((moment($scope.stoppedTime).diff(moment($scope.startTime))));
           tick();
           $scope.isRunning = true;
         };
@@ -104,31 +117,37 @@ var timerModule = angular.module('timer', [])
 
         $scope.clear = $element[0].clear = function () {
           // same as stop but without the event being triggered
-          $scope.stoppedTime = new Date();
+          $scope.stoppedTime = moment();
           resetTimeout();
           $scope.timeoutId = null;
           $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.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;
           resetTimeout();
           tick();
           $scope.isRunning = false;
           $scope.clear();
         };
-        
+
         $element.bind('$destroy', function () {
           resetTimeout();
           $scope.isRunning = false;
         });
 
+
         function calculateTimeUnits() {
+          var timeUnits = {}; //will contains time with units
+
           if ($attrs.startTime !== undefined){
-            $scope.millis = new Date() - new Date($scope.startTimeAttr);
+            $scope.millis = moment().diff(moment($scope.startTimeAttr));
           }
+
+          timeUnits = i18nService.getTimeUnits($scope.millis);
+
           // compute time values based on maxTimeUnit specification
           if (!$scope.maxTimeUnit || $scope.maxTimeUnit === 'day') {
             $scope.seconds = Math.floor(($scope.millis / 1000) % 60);
@@ -180,13 +199,16 @@ var timerModule = angular.module('timer', [])
           $scope.daysS = ($scope.days === 1)? '' : 's';
           $scope.monthsS = ($scope.months === 1)? '' : 's';
           $scope.yearsS = ($scope.years === 1)? '' : 's';
+
+
           // new plural-singular unit decision functions (for custom units and multilingual support)
-          $scope.secondUnit = function(singleSecond, pluralSecond){if($scope.seconds === 1){if(singleSecond){return singleSecond;} return 'second';} if(pluralSecond){return pluralSecond;} return 'seconds';};
-          $scope.minuteUnit = function(singleMinute, pluralMinute){if($scope.minutes === 1){if(singleMinute){return singleMinute;} return 'minute';} if(pluralMinute){return pluralMinute;} return 'minutes';};
-          $scope.hourUnit = function(singleHour, pluralHour){if($scope.hours === 1){if(singleHour){return singleHour;} return 'hour';} if(pluralHour){return pluralHour;} return 'hours';};
-          $scope.dayUnit = function(singleDay, pluralDay){if($scope.days === 1){if(singleDay){return singleDay;} return 'day';} if(pluralDay){return pluralDay;} return 'days';};
-          $scope.monthUnit = function(singleMonth, pluralMonth){if($scope.months === 1){if(singleMonth){return singleMonth;} return 'month';} if(pluralMonth){return pluralMonth;} return 'months';};
-          $scope.yearUnit = function(singleYear, pluralYear){if($scope.years === 1){if(singleYear){return singleYear;} return 'year';} if(pluralYear){return pluralYear;} return 'years';};
+          $scope.secondUnit = timeUnits.seconds;
+          $scope.minuteUnit = timeUnits.minutes;
+          $scope.hourUnit = timeUnits.hours;
+          $scope.dayUnit = timeUnits.days;
+          $scope.monthUnit = timeUnits.months;
+          $scope.yearUnit = timeUnits.years;
+
           //add leading zero if number is smaller than 10
           $scope.sseconds = $scope.seconds < 10 ? '0' + $scope.seconds : $scope.seconds;
           $scope.mminutes = $scope.minutes < 10 ? '0' + $scope.minutes : $scope.minutes;
@@ -229,17 +251,16 @@ var timerModule = angular.module('timer', [])
         }
         calculateTimeUnits();
 
-        var tick = function () {
+        var tick = function tick() {
 
-          $scope.millis = new Date() - $scope.startTime;
+          $scope.millis = moment().diff($scope.startTime);
           var adjustment = $scope.millis % 1000;
 
           if ($scope.endTimeAttr) {
-            $scope.millis = $scope.endTime - new Date();
+            $scope.millis = moment($scope.endTime).diff(moment());
             adjustment = $scope.interval - $scope.millis % 1000;
           }
 
-
           if ($scope.countdownattr) {
             $scope.millis = $scope.countdown * 1000;
           }
@@ -279,7 +300,7 @@ var timerModule = angular.module('timer', [])
         }
       }]
     };
-  }]);
+    }]);
 
 /* commonjs package manager support (eg componentjs) */
 if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){

app/js/i18nService.js

@@ -0,0 +1,52 @@
+var app = angular.module('timer');
+
+app.factory('I18nService', function() {
+
+    var I18nService = function() {};
+
+    I18nService.prototype.language = 'en';
+    I18nService.prototype.timeHumanizer = {};
+
+    I18nService.prototype.init = function init(lang){
+        this.language = lang;
+        //moment init
+        moment.locale(this.language);
+
+        //human duration init, using it because momentjs does not allow accurate time (
+        // momentJS: a few moment ago, human duration : 4 seconds ago
+        this.timeHumanizer = humanizeDuration.humanizer({
+            language: this.language,
+            halfUnit:false
+        });
+    };
+
+    /**
+     * get time with units from momentJS i18n
+     * @param {int} millis
+     * @returns {{millis: string, seconds: string, minutes: string, hours: string, days: string, months: string, years: string}}
+     */
+    I18nService.prototype.getTimeUnits = function getTimeUnits(millis) {
+        var diffFromAlarm = Math.round(millis/1000) * 1000; //time in milliseconds, get rid of the last 3 ms value to avoid 2.12 seconds display
+
+        var time = {};
+
+        if (typeof this.timeHumanizer != 'undefined'){
+            time = {
+                'millis' : this.timeHumanizer(diffFromAlarm, { units: ["milliseconds"] }),
+                'seconds' : this.timeHumanizer(diffFromAlarm, { units: ["seconds"] }),
+                'minutes' : this.timeHumanizer(diffFromAlarm, { units: ["minutes", "seconds"] }) ,
+                'hours' : this.timeHumanizer(diffFromAlarm, { units: ["hours", "minutes", "seconds"] }) ,
+                'days' : this.timeHumanizer(diffFromAlarm, { units: ["days", "hours", "minutes", "seconds"] }) ,
+                'months' : this.timeHumanizer(diffFromAlarm, { units: ["months", "days", "hours", "minutes", "seconds"] }) ,
+                'years' : this.timeHumanizer(diffFromAlarm, { units: ["years", "months", "days", "hours", "minutes", "seconds"] })
+            };
+        }
+        else {
+            console.error('i18nService has not been initialized. You must call i18nService.init("en") for example');
+        }
+
+        return time;
+    };
+
+    return I18nService;
+});

bower.json

@@ -9,16 +9,23 @@
     "url": "git://github.com/siddii/angular-timer.git"
   },
   "dependencies": {
-    "angular": ">= 1.0.7"
+    "angular": ">= 1.0.7",
+    "momentjs": "~2.9.0",
+    "humanize-duration": "~2.4.0",
+    "angular-mocks": "~1.3.13"
   },
   "devDependencies": {
-      "bootstrap": "2.3.2",
-      "angular-scenario": ">= 1.0.7",
-      "angular-mocks": ">= 1.0.7"
+    "bootstrap": "2.3.2",
+    "angular-scenario": ">= 1.0.7",
+    "angular-mocks": ">= 1.0.7"
   },
   "main": "./dist/angular-timer.js",
   "ignore": [
     "node_modules",
     "bower_components"
-  ]
+  ],
+  "resolutions": {
+    "angular": "~1.3.13",
+    "humanize-duration": "~2.4.0"
+  }
 }

bower_components/angular-mocks/.bower.json

@@ -1,18 +1,19 @@
 {
   "name": "angular-mocks",
-  "version": "1.2.0-rc.2",
+  "version": "1.3.13",
   "main": "./angular-mocks.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.0-rc.2"
+    "angular": "1.3.13"
   },
   "homepage": "https://github.com/angular/bower-angular-mocks",
-  "_release": "1.2.0-rc.2",
+  "_release": "1.3.13",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.0-rc.2",
-    "commit": "9bdf39463a7e59c35f4f6163853c8da4fbf81ea3"
+    "tag": "v1.3.13",
+    "commit": "8f53bfda01696e53549fe3266b0a4d220ea9bf77"
   },
   "_source": "git://github.com/angular/bower-angular-mocks.git",
-  "_target": ">= 1.0.7",
+  "_target": "~1.3.13",
   "_originalSource": "angular-mocks"
 }

bower_components/angular-mocks/README.md

@@ -1,4 +1,57 @@
-bower-angular-mocks
-===================
+# packaged angular-mocks
 
-angular-mocks.js bower repo
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
+[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngMock).
+Please file issues and pull requests against that repo.
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-mocks
+```
+
+The mocks are then available at `node_modules/angular-mocks/angular-mocks.js`.
+
+Note that this package is not in CommonJS format, so doing `require('angular-mocks')` will
+return `undefined`.
+
+### bower
+
+```shell
+bower install angular-mocks
+```
+
+The mocks are then available at `bower_components/angular-mocks/angular-mocks.js`.
+
+## Documentation
+
+Documentation is available on the
+[AngularJS docs site](https://docs.angularjs.org/guide/unit-testing).
+
+## License
+
+The MIT License
+
+Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.