another attempt to fix unloading (#36)

aminought · web-flow · commit 05e8c7e1c048 · 2024-11-30T22:45:55.000+05:00
diff --git a/src/second_sidebar/controllers/web_panel.mjs b/src/second_sidebar/controllers/web_panel.mjs
@@ -104,7 +104,19 @@ export class WebPanelController {
     return this.webPanel.getCurrentUrl();
   }
 
+  hackAsyncTabSwitcher() {
+    const tabBrowser = this.webPanel.getTabBrowser();
+    tabBrowser._printPreviewBrowsers.add(this.webPanel.getXUL());
+  }
+
+  unhackAsyncTabSwitcher() {
+    const tabBrowser = this.webPanel.getTabBrowser();
+    tabBrowser._printPreviewBrowsers.delete(this.webPanel.getXUL());
+  }
+
   initWebPanel() {
+    this.hackAsyncTabSwitcher();
+
     this.webPanel.listenBrowserProgressListener(() => {
       this.webPanel.setZoom(this.webPanel.zoom);
       if (this.webPanel.isActive()) {
@@ -175,6 +187,7 @@ export class WebPanelController {
   }
 
   unload() {
+    this.unhackAsyncTabSwitcher();
     this.sidebarController.close();
     this.webPanel.remove();
     this.webPanelTab.remove();
@@ -333,6 +346,7 @@ export class WebPanelController {
   }
 
   remove() {
+    this.unhackAsyncTabSwitcher();
     this.webPanel.remove();
     this.webPanelTab.remove();
     this.webPanelButton.remove();
diff --git a/src/second_sidebar/controllers/web_panels.mjs b/src/second_sidebar/controllers/web_panels.mjs
@@ -166,13 +166,6 @@ export class WebPanelsController {
   delete(uuid) {
     const index = this.getIndex(uuid);
     if (index !== -1) {
-      const webPanelController = this.get(uuid);
-      const webPanel = webPanelController.webPanel;
-
-      // Revert hack to deceive AsyncTabSwitcher
-      const tabBrowser = webPanel.getTabBrowser();
-      tabBrowser._printPreviewBrowsers.delete(webPanel.getXUL());
-
       delete this.webPanelControllers[uuid];
     }
   }
@@ -292,11 +285,6 @@ export class WebPanelsController {
       unloadOnClose,
       hideToolbar,
     );
-
-    // Hack to deceive AsyncTabSwitcher
-    const tabBrowser = webPanel.getTabBrowser();
-    tabBrowser._printPreviewBrowsers.add(webPanel.getXUL());
-
     return webPanel;
   }
 
