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(select): firing events properly in popover interface

Browse Source
This commit is contained in:
Szymon Stasik
2017-05-03 05:27:13 -05:00
committed by Manu MA
parent 19020108aa
commit 59dd853f54
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/select/select-popover-component.ts
View File

@ -8,6 +8,7 @@ export interface SelectPopoverOption {
value: string; value: string;
disabled: boolean; disabled: boolean;
checked: boolean; checked: boolean;
handler?: Function;
} }
/** @hidden */ /** @hidden */
@ -30,6 +31,10 @@ export class SelectPopover implements OnInit {
} }
public set value(value: any) { public set value(value: any) {
let checkedOption = this.options.find(option => option.value === value);
if (checkedOption && checkedOption.handler) {
checkedOption.handler();
}
this.viewController.dismiss(value); this.viewController.dismiss(value);
} }

12
src/components/select/select.ts
View File

@ -301,7 +301,11 @@ export class Select extends BaseInput<any> implements OnDestroy {
text: input.text, text: input.text,
checked: input.selected, checked: input.selected,
disabled: input.disabled, disabled: input.disabled,
value: input.value value: input.value,
handler: () => {
this.value = input.value;
input.ionSelect.emit(input.value);
}
})); }));
overlay = new Popover(this._app, SelectPopover, { overlay = new Popover(this._app, SelectPopover, {
@ -368,12 +372,6 @@ export class Select extends BaseInput<any> implements OnDestroy {
overlay.onDidDismiss((value: any) => { overlay.onDidDismiss((value: any) => {
this._fireBlur(); this._fireBlur();
if (this.interface === 'popover' && value) {
this.value = value;
this.ionChange.emit(value);
}
this._overlay = undefined; this._overlay = undefined;
}); });