javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(): handle failure in hardware back button

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/utils/hardware-back-button.ts
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;
}
}
});