Issue 5817 - Make sure to send initialization message to the Block Element pop-up only after it is …

lib/filterComposer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 207 matching lines @@
   return browser.windows.create({
     url: browser.extension.getURL("composer.html"),
     left: 50,
     top: 50,
     width: 420,
     height: 200,
     type: "popup"
   }).then(window =>
   {
     let popupPageId = window.tabs[0].id;
-    function onRemoved(removedPageId)
+
+    let doInit = () =>
     {
-      if (popupPageId == removedPageId)
+      browser.tabs.sendMessage(popupPageId, {
+        type: "composer.dialog.init",
+        sender: sender.page.id,
+        filters: message.filters
+      });
+    };
+    if (window.tabs[0].status != "complete")
+    {
+      let updateListener = (tabId, changeInfo, tab) =>
+      {
+        if (tabId == popupPageId && changeInfo.status == "complete")
+        {
+          browser.tabs.onUpdated.removeListener(updateListener);
+          doInit();
+        }
+      };
+      browser.tabs.onUpdated.addListener(updateListener);
+    }
+    else
+      doInit();
+
+    let onRemoved = removedTabId =>

[Wladimir Palant, 2017/11/09 14:14:12]

The changes after this line aren't strictly necessary, I simply wanted to keep
it consistent and to remove ext usage.

[kzar, 2017/11/10 14:51:50]

Acknowledged.

+    {
+      if (removedTabId == popupPageId)
       {
         sender.page.sendMessage({
           type: "composer.content.dialogClosed",
           popupId: popupPageId
         });
-        ext.pages.onRemoved.removeListener(onRemoved);
+        browser.tabs.onRemoved.removeListener(onRemoved);
       }
-    }
-    ext.pages.onRemoved.addListener(onRemoved);
+    };
+    browser.tabs.onRemoved.addListener(onRemoved);
 
     if (require("info").application == "firefox" &&
         navigator.oscpu.startsWith("Linux"))
     {
       // Work around https://bugzil.la/1408446
       browser.windows.update(window.id, {width: window.width + 1});
     }
     return popupPageId;
   });
 });
@@ skipping 18 matching lines @@
 {
   return quoteCSS(message.CSS);
 });
 
 ext.pages.onLoading.addListener(page =>
 {
   // A newly opened tab that is still loading has its URL set to about:blank
   if (/^https?:/.test(page.url.protocol))
     page.sendMessage({type: "composer.content.finished"});
 });