Issue 3842 - Split up the logic updating the icon and context menu

popup.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 18 matching lines @@
 function onLoad()
 {
   ext.pages.query({active: true, lastFocusedWindow: true}, function(pages)
   {
     page = pages[0];
 
     // Mark page as 'local' or 'nohtml' to hide non-relevant elements
     if (!page || (page.url.protocol != "http:" &&
                   page.url.protocol != "https:"))
       document.body.classList.add("local");
-    else if (!backgroundPage.htmlPages.has(page))
+    else if (!require("filterComposer").isPageReady(page))

[Sebastian Noack, 2016/03/21 22:10:03]

The changes below are from rebasing. However, while palant insisted to make
require("messaging") inline on the other review, I did the same for
require("filterComposer") here while rebasing.

[kzar, 2016/03/22 07:06:03]

Acknowledged.

     {
       document.body.classList.add("nohtml");
       require("messaging").getPort(window).on(
         "composer.ready", function(message, sender)
         {
           if (sender.page.id == page.id)
             document.body.classList.remove("nohtml");
         }
       );
     }
@@ skipping 84 matching lines @@
 }
 
 function toggleCollapse(event)
 {
   var collapser = event.currentTarget;
   Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option];
   collapser.parentNode.classList.toggle("collapsed");
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);