Merge pull request #2 from Eurofunk/master

Added ability to handle empty model - fixed tests
fmccown · Oct 6, 2015 · 311244f · 311244f
2 parents d283102 + 00e6d2e
commit 311244f
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/src/timepicker/timepicker.js b/src/timepicker/timepicker.js
@@ -221,15 +221,13 @@ angular.module('ui.bootstrap.timepicker', [])
       var hours = getHoursFromTemplate(),
         minutes = getMinutesFromTemplate();
 
-      if (angular.isDefined(hours)) {
-        if (angular.isDefined(minutes)) {
-          selected.setHours(hours);
-          selected.setMinutes(minutes);
-          if (selected < min || selected > max) {
-            invalidate(true);
-          } else {
-            refresh('h');
-          }
+      if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+        selected.setHours(hours);
+        selected.setMinutes(minutes);
+        if (selected < min || selected > max) {
+          invalidate(true);
+        } else {
+          refresh('h');
         }
       } else {
         invalidate(true);
@@ -242,7 +240,7 @@ angular.module('ui.bootstrap.timepicker', [])
         invalidate(true);
       } else if (!$scope.invalidHours && $scope.hours < 10) {
         $scope.$apply(function() {
-        $scope.hours = pad($scope.hours);
+          $scope.hours = pad($scope.hours);
         });
       }
     });
@@ -251,15 +249,13 @@ angular.module('ui.bootstrap.timepicker', [])
       var minutes = getMinutesFromTemplate(),
         hours = getHoursFromTemplate();
 
-      if (angular.isDefined(minutes)) {
-        if (angular.isDefined(hours)) {
-          selected.setHours(hours);
-          selected.setMinutes(minutes);
-          if (selected < min || selected > max) {
-            invalidate(undefined, true);
-          } else {
-            refresh('m');
-          }
+      if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+        selected.setHours(hours);
+        selected.setMinutes(minutes);
+        if (selected < min || selected > max) {
+          invalidate(undefined, true);
+        } else {
+          refresh('m');
         }
       } else {
         invalidate(undefined, true);