Issue 5587, 5748 - Use mobile options page on Firefox for Android

options.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-const {require} = chrome.extension.getBackgroundPage();
-
-let messageQueue = [];
-
 let iframe = document.getElementById("content");
 
-function queueMessage(message, sender, sendResponse)
+iframe.onload = () =>
 {
-  // Ignore messages from anywhere but the background page.

[Manish Jethani, 2017/09/26 20:37:15]

Now there's no need to queue messages, all of this code is gone.

-  if (sender.tab ||
-      sender.url && sender.url != chrome.extension.getBackgroundPage().location)
-  {
-    return;
-  }
+  document.title = iframe.contentDocument.title;
+};
 
-  messageQueue.push({message, sendResponse});
-}
-
-function handleContentLoad(event)
+chrome.runtime.sendMessage({

[Oleksandr, 2017/10/09 11:49:59]

Edge does not support the 'chrome' namespace for extensions. We should map to
'browser' here instead.

[Manish Jethani, 2017/10/09 12:00:55]

Thanks.

[Sebastian Noack, 2017/10/09 15:09:55]

Note that we already do so in ext/common.js:
https://hg.adblockplus.org/adblockpluschrome/file/7136ad8e321d/ext/common.js#l22

+  type: "app.get",
+  what: "application"
+},
+application =>
 {
-  iframe.onload = null;
-
-  chrome.runtime.onMessage.removeListener(queueMessage);
-
-  document.title = iframe.contentDocument.title;

[Manish Jethani, 2017/09/19 19:42:05]

Update title.

-
-  // Make a local reference to the message queue and release the global
-  // reference to avoid any memory leaks.
-  let messageQueueLocalReference = messageQueue;
-  messageQueue = null;
-
-  // Process message queue.
-  for (let {message, sendResponse} of messageQueueLocalReference)
-    iframe.contentWindow.ext.onMessage._dispatch(message, {}, sendResponse);
-}
-
-// Queue up messages from the background page until the content has finished
-// loading.
-chrome.runtime.onMessage.addListener(queueMessage);
-
-// When the content has finished loading, stop listening for messages from the
-// background page and forward all the queued up messages to the content
-// document.
-iframe.onload = handleContentLoad;
-
-// Load the mobile version of the options page on Firefox for Android.
-iframe.src = iframe.getAttribute("data-src-" + require("info").application) ||
-             iframe.getAttribute("data-src");
+  // Load the mobile version of the options page on Firefox for Android.
+  iframe.src = iframe.getAttribute("data-src-" + application) ||
+               iframe.getAttribute("data-src");
+});