Merge branch 'master' into v4

This commit is contained in:
Adam Bradley
2017-05-03 10:50:18 -05:00
3 changed files with 21 additions and 7 deletions

View File

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

View File

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