fix: Discard page even if it's trying to prevent closing

mbnuqw · Apr 5, 2024 · 51ad480 · 51ad480
1 parent 1311c1c
commit 51ad480
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/defaults/settings.ts b/src/defaults/settings.ts
@@ -88,6 +88,7 @@ export const DEFAULT_SETTINGS: SettingsState = {
   newTabCtxReopen: false,
   tabWarmupOnHover: true,
   tabSwitchDelay: 0,
+  forceDiscard: true,
 
   // New tab position
   moveNewTabPin: 'start',

diff --git a/src/services/tabs.fg.actions.ts b/src/services/tabs.fg.actions.ts
@@ -1135,7 +1135,25 @@ export async function discardTabs(tabIds: ID[] = []): Promise<void> {
     }
   }
 
-  browser.tabs.discard(tabIds).catch(err => {
+  // Force discard for pages that prevent their own closing
+  if (Settings.state.forceDiscard && Permissions.allUrls) {
+    const forceDiscardInjection =
+      'window.onbeforeunload=null;window.addEventListener("beforeunload", e => {e.returnValue = ""})'
+    await Promise.allSettled(
+      tabIds.map(id => {
+        const tab = Tabs.byId[id]
+        if (!tab?.url.startsWith('h')) return
+        return browser.tabs.executeScript(id, {
+          code: forceDiscardInjection,
+          runAt: 'document_start',
+          allFrames: true,
+        })
+      })
+    )
+  }
+
+  // Try to discard tabs
+  return browser.tabs.discard(tabIds).catch(err => {
     Logs.err('Tabs.discardTabs: Cannot discard:', err)
   })
 }

diff --git a/src/types/settings.ts b/src/types/settings.ts
@@ -87,6 +87,7 @@ export interface SettingsState {
   newTabCtxReopen: boolean
   tabWarmupOnHover: boolean
   tabSwitchDelay: number
+  forceDiscard: boolean
 
   // New tab position
   moveNewTabPin: (typeof SETTINGS_OPTIONS.moveNewTabPin)[number]