javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(datetime): ionChange/ngModel returns the correct value

Browse Source
This commit is contained in:
Manuel Mtz-Almeida
2017-04-27 18:35:37 +02:00
parent 505d27ad34
commit af394b5ef6
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/datetime/datetime.ts
View File

@ -267,13 +267,14 @@ import { dateValueRange, renderDateTime, renderTextFormat, convertFormatToKey, g
providers: [ { provide: NG_VALUE_ACCESSOR, useExisting: DateTime, multi: true } ],
encapsulation: ViewEncapsulation.None,
})
export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit, ControlValueAccessor, OnDestroy {
export class DateTime extends BaseInput<DateTimeData|string> implements AfterViewInit, ControlValueAccessor, OnDestroy {
_text: string = '';
_min: DateTimeData;
_max: DateTimeData;
_locale: LocaleData = {};
_picker: Picker;
_internalValue: DateTimeData = {};
/**
* @input {string} The minimum datetime allowed. Value must be a date string
@ -436,6 +437,21 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit,
this._initialize();
}
/**
* @hidden
*/
_inputReset() {
this._internalValue = {};
}
/**
* @hidden
*/
_inputCheckHasValue(val: any) {
updateDate(this._internalValue, val);
super._inputCheckHasValue(val);
}
/**
* @hidden
*/
@ -446,16 +462,16 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit,
/**
* @hidden
*/
_inputNormalize(val: any): DateTimeData {
updateDate(this._value, val);
return this._value;
_inputShouldChange(): boolean {
return true;
}
/**
* TODO: REMOVE THIS
* @hidden
*/
_inputShouldChange(): boolean {
return true;
_inputChangeEvent(): any {
return this.value;
}
@HostListener('click', ['$event'])
@ -742,7 +758,7 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit,
* @hidden
*/
getValue(): DateTimeData {
return this._value;
return this._internalValue;
}
/**

17
src/util/base-input.ts
View File

@ -143,9 +143,13 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
if (isUndefined(val)) {
return false;
}
const normalized = (val === null)
? deepCopy(this._defaultValue)
: this._inputNormalize(val);
let normalized;
if (val === null) {
normalized = deepCopy(this._defaultValue);
this._inputReset();
} else {
normalized = this._inputNormalize(val);
}
const notUpdate = isUndefined(normalized) || !this._inputShouldChange(normalized);
if (notUpdate) {
@ -285,7 +289,12 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
/**
* @hidden
*/
initFocus() {}
initFocus() { }
/**
* @hidden
*/
_inputReset() { }
/**
* @hidden