mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-17 04:41:36 +08:00
Merge pull request #1133 from NativeScript/time-picker-max-hour
Time picker max hour fixed
This commit is contained in:
@ -76,11 +76,11 @@ export function test_WhenCreated_MinHourIs1() {
|
||||
});
|
||||
}
|
||||
|
||||
export function test_WhenCreated_MaxHourIs23() {
|
||||
export function test_WhenCreated_MaxHourIs24() {
|
||||
helper.buildUIAndRunTest(_createTimePicker(), function (views: Array<viewModule.View>) {
|
||||
var timePicker = <timePickerModule.TimePicker>views[0];
|
||||
var actualValue = timePicker.maxHour;
|
||||
var expectedValue = 23;
|
||||
var expectedValue = 24;
|
||||
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
|
||||
});
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ import view = require("ui/core/view");
|
||||
import types = require("utils/types");
|
||||
|
||||
function isHourValid(value: number): boolean {
|
||||
return types.isNumber(value) && value >= 1 && value <= 23;
|
||||
return types.isNumber(value) && value >= 1 && value <= 24;
|
||||
}
|
||||
|
||||
function isMinuteValid(value: number): boolean {
|
||||
@ -48,7 +48,7 @@ export class TimePicker extends view.View implements definition.TimePicker {
|
||||
new proxy.PropertyMetadata(1, dependencyObservable.PropertyMetadataSettings.None, undefined, isHourValid));
|
||||
|
||||
public static maxHourProperty = new dependencyObservable.Property("maxHour", "TimePicker",
|
||||
new proxy.PropertyMetadata(23, dependencyObservable.PropertyMetadataSettings.None, undefined, isHourValid));
|
||||
new proxy.PropertyMetadata(24, dependencyObservable.PropertyMetadataSettings.None, undefined, isHourValid));
|
||||
|
||||
public static minuteProperty = new dependencyObservable.Property("minute", "TimePicker",
|
||||
new proxy.PropertyMetadata(undefined, dependencyObservable.PropertyMetadataSettings.None, undefined, isMinuteValid));
|
||||
|
Reference in New Issue
Block a user