Issue 293 - AdBlock button is slow to appear on toolbar after launching Firefox

lib/ui.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 423 matching lines @@
           return;
 
         this.showNextNotification(subject.location.href);
       }.bind(UI)
     };
     Services.obs.addObserver(documentCreationObserver, "content-document-global-created", false);
     onShutdown.add(function()
     {
       Services.obs.removeObserver(documentCreationObserver, "content-document-global-created", false);
     });
+
+    // Execute first-run actions if a window is open already, otherwise it
+    // will happen in applyToWindow() when a window is opened.
+    this.firstRunActions(this.currentWindow);
   },
 
   addToolbarButton: function()
   {
     let {WindowObserver} = require("windowObserver");
     new WindowObserver(this);
 
     let {defaultToolbarPosition} = require("appSupport");
     if ("abp-toolbarbutton" in this.overlay && defaultToolbarPosition)
     {
@@ skipping 13 matching lines @@
         positionAttribute: "abp-iconposition",        // For emulation only
         defaultArea: defaultToolbarPosition.parent,
         defaultBefore: defaultToolbarPosition.before, // For emulation only
         defaultAfter: defaultToolbarPosition.after,   // For emulation only
         removable: true,
         onBuild: function(document)
         {
           let node = document.importNode(this.overlay["abp-toolbarbutton"], true);
           node.addEventListener("click", this.onIconClick, false);
           node.addEventListener("command", this.onIconClick, false);
-          if ("addClass" in defaultToolbarPosition)
-            node.classList.add(defaultToolbarPosition.addClass);
           this.updateIconState(document.defaultView, node);
           return node;
         }.bind(this),
         onAdded: function(node)
         {
           // For emulation only, this callback isn't part of the official
           // CustomizableUI API.
           this.updateIconState(node.ownerDocument.defaultView, node);
         }.bind(this),
       });
       onShutdown.add(CustomizableUI.destroyWidget.bind(CustomizableUI, "abp-toolbarbutton"));
     }
   },
 
+  firstRunActions: function(window)
+  {
+    if (this.firstRunDone || !window || FilterStorage._loading)
+      return;
+
+    this.firstRunDone = true;
+
+    let {addonVersion} = require("info");
+    let prevVersion = Prefs.currentVersion;
+    if (prevVersion != addonVersion)
+    {
+      Prefs.currentVersion = addonVersion;
+      this.addSubscription(window, prevVersion);
+    }
+  },
+
   /**
    * Will be set to true after the check whether first-run actions should run
    * has been performed.
    * @type Boolean
    */
   firstRunDone: false,
 
   /**
    * Initializes Adblock Plus UI in a window.
    */
@@ skipping 51 matching lines @@
       this.updateIconState(window, window.document.getElementById("abp-toolbarbutton"));
     }.bind(this));
     addBrowserClickListener(window, this.onBrowserClick.bind(this, window));
 
     window.document.getElementById("abp-notification-close").addEventListener("command", function(event)
     {
       window.document.getElementById("abp-notification").hidePopup();
     }, false);
 
     // First-run actions?
-    if (!this.firstRunDone)
-    {
-      this.firstRunDone = true;
-
-      let {addonVersion} = require("info");
-      let prevVersion = Prefs.currentVersion;
-      if (prevVersion != addonVersion)
-      {
-        Prefs.currentVersion = addonVersion;
-        this.addSubscription(window, prevVersion);
-      }
-    }
+    this.firstRunActions(window);
 
     // Some people actually switch off browser.frames.enabled and are surprised
     // that things stop working...
     window.QueryInterface(Ci.nsIInterfaceRequestor)
           .getInterface(Ci.nsIWebNavigation)
           .QueryInterface(Ci.nsIDocShell)
           .allowSubframes = true;
   },
 
   /**
@@ skipping 494 matching lines @@
       return;
 
     let state = (Prefs.enabled ? "active" : "disabled");
     if (state == "active")
     {
       let location = this.getCurrentLocation(window);
       if (location && Policy.isWhitelisted(location.spec))
         state = "whitelisted";
     }
 
+    let popupId = "abp-status-popup";
     if (icon.localName == "statusbarpanel")
     {
       if (Prefs.defaultstatusbaraction == 0)
-        icon.setAttribute("popup", icon.getAttribute("context"));
+      {
+        icon.setAttribute("popup", popupId);
+        icon.removeAttribute("context");
+      }
       else
+      {
         icon.removeAttribute("popup");
+        icon.setAttribute("context", popupId);
+      }
     }
     else
     {
       if (Prefs.defaulttoolbaraction == 0)
+      {
         icon.setAttribute("type", "menu");
+        icon.removeAttribute("context");
+      }
       else
+      {
         icon.setAttribute("type", "menu-button");
+        icon.setAttribute("context", popupId);
+      }
     }
 
     icon.setAttribute("abpstate", state);
   },
 
   /**
    * Shows or hides status bar icons in all windows, according to pref.
    */
   updateStatusbarIcon: function(/**Window*/ window)
   {
@@ skipping 164 matching lines @@
         this.fillIconMenu(event, popup.ownerDocument.defaultView, match[1]);
     }
   },
 
   /**
    * Handles click on toolbar and status bar icons.
    */
   onIconClick: function(/**Event*/ event)
   {
     if (event.eventPhase != event.AT_TARGET)
-      return;
-
-    if (FilterStorage._loading)
       return;

[Wladimir Palant, 2014/05/23 11:50:50]

I guess I could just as well remove that failsafe - any functions that can be
triggered here can also be triggered via the menu. And none of them seem
problematic even if filters aren't loaded, see my comment in the issue.

[Thomas Greiner, 2014/05/23 16:10:31]

Doesn't seem to affect the upcoming changes to the icon popup so that's fine
with me.

 
     let isToolbar = (event.target.localName != "statusbarpanel");
     let action = 0;
     if ((isToolbar && event.type == "command") || (!isToolbar && event.button == 0))
       action = (isToolbar ? Prefs.defaulttoolbaraction : Prefs.defaultstatusbaraction);
     else if (event.button == 1)
       action = 3;
 
     let window = event.target.ownerDocument.defaultView;
     if (action == 1)
@@ skipping 632 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });