Skip to content

Commit 723720b

Browse files
committed
fix(timepicker): fix minTime/maxTime
1 parent 01e9614 commit 723720b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/timepicker/timepicker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ angular.module('mgcrea.ngStrap.timepicker', ['mgcrea.ngStrap.helpers.dateParser'
134134
} else if(index === 1) {
135135
selectedTime = date.getTime() + viewDate.hour * 36e5;
136136
}
137-
return selectedTime < options.minTime || selectedTime > options.maxTime;
137+
return selectedTime < options.minTime * 1 || selectedTime > options.maxTime * 1;
138138
};
139139

140140
$timepicker.$moveIndex = function(value, index) {
@@ -314,7 +314,7 @@ angular.module('mgcrea.ngStrap.timepicker', ['mgcrea.ngStrap.helpers.dateParser'
314314
} else if(angular.isString(newValue) && newValue.match(/^".+"$/)) {
315315
timepicker.$options[key] = +new Date(newValue.substr(1, newValue.length - 2));
316316
} else {
317-
timepicker.$options[key] = dateParser.parse(newValue);
317+
timepicker.$options[key] = dateParser.parse(newValue, new Date(1970, 0, 1, 0));
318318
}
319319
!isNaN(timepicker.$options[key]) && timepicker.$build();
320320
});

0 commit comments

Comments
 (0)