fix(timepicker): Don't allow mixture of numbers and letters.

Closes angular-ui#5085
deeg · Jan 11, 2016 · d322192 · d322192
1 parent aa010b0
commit d322192
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/timepicker/test/timepicker.spec.js b/src/timepicker/test/timepicker.spec.js
@@ -1159,7 +1159,6 @@ describe('timepicker directive', function() {
       expect(getModelState()).toEqual([14, 9, 25]);
     });
 
-
     it('updates seconds & pads on input change & pads on blur', function() {
       var el = getSecondsInputEl();
 
@@ -1192,7 +1191,7 @@ describe('timepicker directive', function() {
     it('clears model when input minutes is invalid & alerts the UI', function() {
       var el = getMinutesInputEl();
 
-      changeInputValueTo(el, 'pizza');
+      changeInputValueTo(el, '8a');
       expect($rootScope.time).toBe(null);
       expect(el.parent().hasClass('has-error')).toBe(true);
       expect(element.hasClass('ng-invalid-time')).toBe(true);
@@ -1204,7 +1203,6 @@ describe('timepicker directive', function() {
       expect(element.hasClass('ng-invalid-time')).toBe(false);
     });
 
-
     it('clears model when input seconds is invalid & alerts the UI', function() {
       var el = getSecondsInputEl();
 

diff --git a/src/timepicker/timepicker.js b/src/timepicker/timepicker.js
@@ -51,14 +51,14 @@ angular.module('ui.bootstrap.timepicker', [])
   var hourStep = timepickerConfig.hourStep;
   if ($attrs.hourStep) {
     $scope.$parent.$watch($parse($attrs.hourStep), function(value) {
-      hourStep = parseInt(value, 10);
+      hourStep = Number(value);
     });
   }
 
   var minuteStep = timepickerConfig.minuteStep;
   if ($attrs.minuteStep) {
     $scope.$parent.$watch($parse($attrs.minuteStep), function(value) {
-      minuteStep = parseInt(value, 10);
+      minuteStep = Number(value);
     });
   }
 
@@ -128,7 +128,7 @@ angular.module('ui.bootstrap.timepicker', [])
   var secondStep = timepickerConfig.secondStep;
   if ($attrs.secondStep) {
     $scope.$parent.$watch($parse($attrs.secondStep), function(value) {
-      secondStep = parseInt(value, 10);
+      secondStep = Number(value);
     });
   }
 
@@ -160,7 +160,7 @@ angular.module('ui.bootstrap.timepicker', [])
 
   // Get $scope.hours in 24H mode if valid
   function getHoursFromTemplate() {
-    var hours = parseInt($scope.hours, 10);
+    var hours = Number($scope.hours);
     var valid = $scope.showMeridian ? hours > 0 && hours < 13 :
       hours >= 0 && hours < 24;
     if (!valid) {
@@ -179,12 +179,12 @@ angular.module('ui.bootstrap.timepicker', [])
   }
 
   function getMinutesFromTemplate() {
-    var minutes = parseInt($scope.minutes, 10);
+    var minutes = Number($scope.minutes);
     return minutes >= 0 && minutes < 60 ? minutes : undefined;
   }
 
   function getSecondsFromTemplate() {
-    var seconds = parseInt($scope.seconds, 10);
+    var seconds = Number($scope.seconds);
     return seconds >= 0 && seconds < 60 ? seconds : undefined;
   }