Fix angular-ui#1114 | timepicker should not fill current time when mo…

…del is null
ulle · Aug 18, 2014 · 8d5eb01 · 8d5eb01
1 parent 7b7cdf8
commit 8d5eb01
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/timepicker/timepicker.js b/src/timepicker/timepicker.js
@@ -206,10 +206,16 @@ angular.module('ui.bootstrap.timepicker', [])
     if ( $scope.showMeridian ) {
       hours = ( hours === 0 || hours === 12 ) ? 12 : hours % 12; // Convert 24 to 12 hour system
     }
-
-    $scope.hours = keyboardChange === 'h' ? hours : pad(hours);
-    $scope.minutes = keyboardChange === 'm' ? minutes : pad(minutes);
-    $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+
+    if (ngModelCtrl.$modelValue) {
+      $scope.hours =  keyboardChange === 'h' ? hours : pad(hours);
+      $scope.minutes = keyboardChange === 'm' ? minutes : pad(minutes);
+      $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+    } else {
+      $scope.hours = null;
+      $scope.minutes = null;
+      $scope.meridian = null;
+    }
   }
 
   function addMinutes( minutes ) {