Issue 5904 - Avoid include.preload.js running twice

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
  * 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 {checkCollapse, elemhide,
-       getURLsFromElement, typeMap} = require("./include.preload");
+// We would rather export these properly and then require("include.preload")
+// here, but that would result in include.preload running both both at pre

[Manish Jethani, 2017/10/24 16:01:37]

Nit: "both both"

[kzar, 2017/10/24 16:19:16]

Done.

+// and post load.
+const {checkCollapse, elemhide, getURLsFromElement, typeMap} = window;
 
 // The page ID for the popup filter selection dialog (top frame only).
 let blockelementPopupId = null;
 
 // Element picking state (top frame only).
 let currentlyPickingElement = false;
 let lastMouseOverEvent = null;
 
 // During element picking this is the currently highlighted element. When
 // element has been picked this is the element that is due to be blocked.
@@ skipping 555 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);
 }