Issue 5985 - Work around Firefox bug causing Block element dialog to be empty on Linux

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 197 matching lines @@
 });
 
 port.on("composer.ready", (message, sender) =>
 {
   readyPages.set(sender.page, null);
   updateContextMenu(sender.page);
 });
 
 port.on("composer.openDialog", (message, sender) =>
 {
-  return new Promise(resolve =>
+  return browser.windows.create({
+    url: browser.extension.getURL("composer.html"),
+    left: 50,
+    top: 50,
+    width: 420,
+    height: 200,
+    type: "popup"
+  }).then(window =>
   {
-    ext.windows.create({

[kzar, 2017/11/03 13:24:06]

I think we can remove ext.windows from ext/background.js now?

[Wladimir Palant, 2017/11/03 13:49:05]

Sure - after the release.

[kzar, 2017/11/03 13:57:06]

Well if we're only doing the bare minimum for the release, I wonder why you
changed this code around here to avoid using ext.windows. But whatever, I've
filed #5987 for that change anyway.

[Wladimir Palant, 2017/11/03 13:59:37]

Because the ext API only gives us a tab ID but not a window ID.

[kzar, 2017/11/03 14:00:56]

Ah, OK.

-      url: browser.extension.getURL("composer.html"),
-      left: 50,
-      top: 50,
-      width: 420,
-      height: 200,
-      type: "popup"
-    },
-    popupPage =>
+    let popupPageId = window.tabs[0].id;
+    function onRemoved(removedPageId)
     {
-      let popupPageId = popupPage.id;
-      function onRemoved(removedPageId)
+      if (popupPageId == removedPageId)
       {
-        if (popupPageId == removedPageId)
-        {
-          sender.page.sendMessage({
-            type: "composer.content.dialogClosed",
-            popupId: popupPageId
-          });
-          ext.pages.onRemoved.removeListener(onRemoved);
-        }
+        sender.page.sendMessage({
+          type: "composer.content.dialogClosed",
+          popupId: popupPageId
+        });
+        ext.pages.onRemoved.removeListener(onRemoved);
       }
-      ext.pages.onRemoved.addListener(onRemoved);
-      resolve(popupPageId);
-    });
+    }
+    ext.pages.onRemoved.addListener(onRemoved);
+
+    if (require("info").application == "firefox" &&
+        navigator.oscpu.startsWith("Linux"))

[kzar, 2017/11/03 13:24:06]

(I'll take your word for it that this is the best way to check for Linux.)

[Wladimir Palant, 2017/11/03 13:49:05]

It's not a great way, but it's worse than any other approach I know of. It
should do for this hack, and we'll hopefully remove it soon (as soon as Firefox
57 gets somewhat out of fashion).

[kzar, 2017/11/03 13:57:06]

Acknowledged.

+    {
+      // Work around https://bugzil.la/1408446
+      browser.windows.update(window.id, {width: window.width + 1});
+    }
+    return popupPageId;
   });
 });
 
 port.on("composer.getFilters", (message, sender) =>
 {
   return composeFilters({
     tagName: message.tagName,
     id: message.id,
     src: message.src,
     style: message.style,
@@ skipping 10 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"});
 });