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

fix(overlay): only register backButton listener once

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-09-14 17:04:30 +02:00
parent 6da765b3d5
commit 75c2d744b6
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/utils/overlays.ts
View File

@ -19,16 +19,6 @@ export function createOverlay<T extends HTMLIonOverlayElement>(element: T, opts:
// append the overlay element to the document body // append the overlay element to the document body
getAppRoot(doc).appendChild(element); getAppRoot(doc).appendChild(element);
doc.addEventListener('ionBackButton', ev => {
(ev as BackButtonEvent).detail.register(100, () => closeTopOverlay(doc));
});
doc.body.addEventListener('keyup', ev => {
if (ev.key === 'Escape') {
closeTopOverlay(doc);
}
});
return element.componentOnReady(); return element.componentOnReady();
} }
@ -43,12 +33,13 @@ function closeTopOverlay(doc: Document) {
export function connectListeners(doc: Document) { export function connectListeners(doc: Document) {
if (lastId === 0) { if (lastId === 0) {
lastId = 1; lastId = 1;
doc.body.addEventListener('keyup', ev => { doc.addEventListener('ionBackButton', ev => {
(ev as BackButtonEvent).detail.register(100, () => closeTopOverlay(doc));
});
doc.addEventListener('keyup', ev => {
if (ev.key === 'Escape') { if (ev.key === 'Escape') {
const lastOverlay = getOverlay(doc); closeTopOverlay(doc);
if (lastOverlay && lastOverlay.backdropDismiss) {
lastOverlay.dismiss('backdrop');
}
} }
}); });
} }