fix(): handle failure in hardware back button

This commit is contained in:
mhartington
2018-09-14 10:58:34 -04:00
parent 0c1f8bbc25
commit 6da765b3d5
6 changed files with 25 additions and 12 deletions

View File

@@ -747,10 +747,16 @@ export class SkeletonText {
export declare interface Slide extends StencilComponents<'IonSlide'> {}
@Component({ selector: 'ion-slide', changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: '<ng-content></ng-content>' })
export class Slide {
ionSlideChanged: EventEmitter<CustomEvent>;
constructor(r: ElementRef) {
const el = r.nativeElement;
proxyOutputs(this, el, ['ionSlideChanged']);
}
}
export declare interface Slides extends StencilComponents<'IonSlides'> {}
@Component({ selector: 'ion-slides', changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: '<ng-content></ng-content>', inputs: ['options', 'pager', 'scrollbar'] })
@Component({ selector: 'ion-slides', changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: '<ng-content></ng-content>', inputs: ['mode', 'options', 'pager', 'scrollbar'] })
export class Slides {
ionSlidesDidLoad: EventEmitter<CustomEvent>;
ionSlideTap: EventEmitter<CustomEvent>;
@@ -772,7 +778,7 @@ export class Slides {
constructor(r: ElementRef) {
const el = r.nativeElement;
proxyMethods(this, el, ['update', 'slideTo', 'slideNext', 'slidePrev', 'getActiveIndex', 'getPreviousIndex', 'length', 'isEnd', 'isBeginning', 'startAutoplay', 'stopAutoplay', 'lockSwipeToNext', 'lockSwipeToPrev', 'lockSwipes']);
proxyInputs(this, el, ['options', 'pager', 'scrollbar']);
proxyInputs(this, el, ['mode', 'options', 'pager', 'scrollbar']);
proxyOutputs(this, el, ['ionSlidesDidLoad', 'ionSlideTap', 'ionSlideDoubleTap', 'ionSlideWillChange', 'ionSlideDidChange', 'ionSlideNextStart', 'ionSlidePrevStart', 'ionSlideNextEnd', 'ionSlidePrevEnd', 'ionSlideTransitionStart', 'ionSlideTransitionEnd', 'ionSlideDrag', 'ionSlideReachStart', 'ionSlideReachEnd', 'ionSlideTouchStart', 'ionSlideTouchEnd']);
}
}

View File

@@ -21,7 +21,7 @@ export class NavController {
private location: Location,
@Optional() private router?: Router
) {
window && window.document.body.addEventListener('ionBackButton', (ev) => {
window && window.document.addEventListener('ionBackButton', (ev) => {
(ev as BackButtonEvent).detail.register(0, () => this.goBack());
});
}

View File

@@ -4019,7 +4019,7 @@ export namespace Components {
* The text to display on the ok button. Default: `OK`.
*/
'okText': string;
'open': (ev?: UIEvent | undefined) => Promise<HTMLIonActionSheetElement | HTMLIonAlertElement | HTMLIonPopoverElement>;
'open': (ev?: UIEvent | undefined) => Promise<HTMLIonPopoverElement | HTMLIonActionSheetElement | HTMLIonAlertElement>;
/**
* The text to display when the select is empty.
*/

View File

@@ -81,7 +81,7 @@ export class Router {
return this.writeNavStateRoot(path, direction);
}
@Listen('window:ionBackButton')
@Listen('document:ionBackButton')
protected onBackButton(ev: BackButtonEvent) {
ev.detail.register(0, () => this.goBack());
}

View File

@@ -9,11 +9,11 @@ interface HandlerRegister {
export function startHardwareBackButton(win: Window) {
let busy = false;
win.addEventListener('backbutton', () => {
win.document.addEventListener('backbutton', () => {
if (busy) {
return;
}
busy = true;
const handlers: HandlerRegister[] = [];
const ev: BackButtonEvent = new CustomEvent('ionBackButton', {
bubbles: false,
@@ -23,9 +23,10 @@ export function startHardwareBackButton(win: Window) {
}
}
});
win.document.body.dispatchEvent(ev);
win.document.dispatchEvent(ev);
if (handlers.length > 0) {
busy = true;
let selectedPriority = Number.MIN_SAFE_INTEGER;
let handler: Handler;
handlers.forEach(h => {
@@ -34,9 +35,15 @@ export function startHardwareBackButton(win: Window) {
handler = h.handler;
}
});
const result = handler!();
if (result != null) {
result.then(() => busy = false);
try {
const result = handler!();
if (result != null) {
result.then(() => (busy = false), () => (busy = false));
} else {
busy = false;
}
} catch (ev) {
busy = false;
}
}
});

View File

@@ -19,7 +19,7 @@ export function createOverlay<T extends HTMLIonOverlayElement>(element: T, opts:
// append the overlay element to the document body
getAppRoot(doc).appendChild(element);
doc.body.addEventListener('ionBackButton', ev => {
doc.addEventListener('ionBackButton', ev => {
(ev as BackButtonEvent).detail.register(100, () => closeTopOverlay(doc));
});