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

composer.postload.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 375 matching lines @@
   if (!currentElement)
     return;
 
   let element = currentElement.prisoner || currentElement;
   getFiltersForElement(element, (filters, selectors) =>
   {
     if (currentlyPickingElement)
       stopPickingElement();
 
     browser.runtime.sendMessage({
-      type: "composer.openDialog"
-    },
-    popupId =>
+      type: "composer.openDialog",
+      filters
+    }, popupId =>
     {
-      browser.runtime.sendMessage({
-        type: "forward",
-        targetPageId: popupId,
-        payload: {type: "composer.dialog.init", filters}
-      });
-
       // Only the top frame keeps a record of the popup window's ID,
       // so if this isn't the top frame we need to pass the ID on.
       if (window == window.top)
       {
         blockelementPopupId = popupId;
       }
       else
       {
         browser.runtime.sendMessage({
           type: "forward",
@@ skipping 173 matching lines @@
 if (document instanceof HTMLDocument)
 {
   // There's a bug in Firefox that causes document_end content scripts to run
   // before document_start content scripts on extension startup. In this case
   // the ext object is undefined, we fail to initialize, and initializeComposer
   // returns false. As a workaround, try again after a timeout.
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1395287
   if (!initializeComposer())
     setTimeout(initializeComposer, 2000);
 }