Skip to content

Replacing unload with pagehide #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vishala230531 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replacing unload with pagehide #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,9 +571,18 @@ export function popup(
}

if (closeOnUnload) {
window.addEventListener("pagehide", () => win.close());
window.addEventListener("unload", () => win.close());
window.addEventListener("beforeunload", () => win.close());
window.addEventListener("beforeunload", () => {
win.close();
});
if ("onpagehide" in window) {
window.addEventListener("pagehide", () => {
win.close();
});
} else {
window.addEventListener("unload", () => {
win.close();
});
}
}

return win;
Expand Down
19 changes: 11 additions & 8 deletions test/tests/dom/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,20 @@ describe("popup", () => {
closeOnUnload: 1,
});

if (!listeners.unload) {
throw new Error(`Popup should have unload listener registered.`);
}

if (!listeners.pagehide) {
throw new Error(`Popup should have pagehide listener registered.`);
}

if (!listeners.beforeunload) {
throw new Error(`Popup should have beforeunload listener registered.`);
}

// Check that either pagehide or unload is registered (but not both)
if ("onpagehide" in window) {
if (!listeners.pagehide) {
throw new Error(`Popup should have pagehide listener registered.`);
}
} else {
if (!listeners.unload) {
throw new Error(`Popup should have unload listener registered.`);
}
}
} catch (e) {
throw new Error(
`Test should not fail with closeOnUnload option - ${e.message}`
Expand Down