Issue 384 - Wrong image shows up briefly for Adblock Plus icon

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 394 matching lines @@
     {
       try
       {
         ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
       }
       catch (e)
       {
         // No built-in CustomizableUI API, use our own implementation.
         ({CustomizableUI}) = require("customizableUI");
       }
-      
+
       CustomizableUI.createWidget({
         id: "abp-toolbarbutton",
         type: "custom",
         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),
       });
@@ skipping 1481 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);
 });