Fix months and years calculation

mehdichamouma · May 17, 2014 · d925633 · d925633
1 parent 47a2daf
commit d925633
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/js/timer.js b/app/js/timer.js
@@ -147,8 +147,8 @@ angular.module('timer', [])
               $scope.minutes = Math.floor((($scope.millis / (60000)) % 60));
               $scope.hours = Math.floor((($scope.millis / (3600000)) % 24));
               $scope.days = Math.floor((($scope.millis / (3600000)) / 24) % 30); 
-              $scope.months = Math.floor(($scope.millis / (3600000)) / 24 / 30);
-              $scope.years = Math.floor(($scope.millis / (3600000)) / 24 / 30 / 12);
+              $scope.months = Math.floor((($scope.millis / (3600000)) / 24 / 30) % 12);
+              $scope.years = Math.floor(($scope.millis / (3600000)) / 24 / 365);
             }
 
             // plural - singular unit decision

diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -1,5 +1,5 @@
 /**
- * angular-timer - v1.1.1 - 2014-05-17 3:24 AM
+ * angular-timer - v1.1.1 - 2014-05-17 3:54 AM
  * https://github.com/siddii/angular-timer
  *
  * Copyright (c) 2014 Siddique Hameed
@@ -154,8 +154,8 @@ angular.module('timer', [])
               $scope.minutes = Math.floor((($scope.millis / (60000)) % 60));
               $scope.hours = Math.floor((($scope.millis / (3600000)) % 24));
               $scope.days = Math.floor((($scope.millis / (3600000)) / 24) % 30); 
-              $scope.months = Math.floor(($scope.millis / (3600000)) / 24 / 30);
-              $scope.years = Math.floor(($scope.millis / (3600000)) / 24 / 30 / 12);
+              $scope.months = Math.floor((($scope.millis / (3600000)) / 24 / 30) % 12);
+              $scope.years = Math.floor(($scope.millis / (3600000)) / 24 / 365);
             }
 
             // plural - singular unit decision

diff --git a/dist/angular-timer.min.js b/dist/angular-timer.min.js