Merge branch 'Flati-master'

rajeshwarpatlolla · Oct 8, 2015 · 38bb709 · 38bb709
2 parents ae9293c + e90604f
commit 38bb709
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/dist/ionic-timepicker.bundle.min.js b/dist/ionic-timepicker.bundle.min.js
diff --git a/src/ionic-timepicker.directive.js b/src/ionic-timepicker.directive.js
@@ -45,11 +45,7 @@
             }
           }
           if (obj.format == 24) {
-            if (scope.time.hours != 23) {
-              scope.time.hours += 1;
-            } else {
-              scope.time.hours = 0;
-            }
+            scope.time.hours = (scope.time.hours + 1) % 24;
           }
           scope.time.hours = (scope.time.hours < 10) ? ('0' + scope.time.hours) : scope.time.hours;
         };
@@ -64,33 +60,24 @@
             }
           }
           if (obj.format == 24) {
-            if (scope.time.hours > 0) {
-              scope.time.hours -= 1;
-            } else {
-              scope.time.hours = 23;
-            }
+            scope.time.hours = (scope.time.hours + 23) % 24;
           }
           scope.time.hours = (scope.time.hours < 10) ? ('0' + scope.time.hours) : scope.time.hours;
         };
 
         scope.increaseMinutes = function () {
           scope.time.minutes = Number(scope.time.minutes);
 
-          if (scope.time.minutes != (60 - obj.step) && (scope.time.minutes + obj.step <= 60)) {
-            scope.time.minutes += obj.step;
-          } else {
-            scope.time.minutes = 0;
-          }
+          scope.time.minutes = (scope.time.minutes + obj.step) % 60;
+
           scope.time.minutes = (scope.time.minutes < 10) ? ('0' + scope.time.minutes) : scope.time.minutes;
         };
 
         scope.decreaseMinutes = function () {
           scope.time.minutes = Number(scope.time.minutes);
-          if (scope.time.minutes !== 0 && (scope.time.minutes - obj.step >= 0)) {
-            scope.time.minutes -= obj.step;
-          } else {
-            scope.time.minutes = 60 - obj.step;
-          }
+
+          scope.time.minutes = (scope.time.minutes + (60 - obj.step)) % 60;
+
           scope.time.minutes = (scope.time.minutes < 10) ? ('0' + scope.time.minutes) : scope.time.minutes;
         };
 
@@ -99,7 +86,9 @@
         };
 
         element.on("click", function () {
-          if (scope.inputObj.inputEpochTime) {
+          if (typeof scope.inputObj.inputEpochTime === 'undefined' || scope.inputObj.inputEpochTime === null) {
+            objDate = new Date();
+          } else {
             objDate = new Date(scope.inputObj.inputEpochTime * 1000);
           }