Bug 981543 - Don`t check whether our toolbar button has a context attribute

lib/ui.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 432 matching lines @@
       if (!/^subscription\.(updated|removed|disabled)$/.test(action) || value.url != Prefs.subscriptions_antiadblockurl)
         return;
 
       if (action == "subscription.updated")
         addAntiAdblockNotification(value);
       else if (action == "subscription.removed" || (action == "subscription.disabled" && !value.disabled))
         removeAntiAdblockNotification();
     });
 
     var documentCreationObserver = {
-      observe: function(subject, topic, data) 
+      observe: function(subject, topic, data)
       {
         if (!(subject instanceof Ci.nsIDOMWindow))
           return;
-        
+
         this._showNextNotification(subject.location.href);
       }.bind(this)
     };
     Services.obs.addObserver(documentCreationObserver, "content-document-global-created", false);
     onShutdown.add(function()
     {
       Services.obs.removeObserver(documentCreationObserver, "content-document-global-created", false);
     });
   },
 
@@ skipping 656 matching lines @@
 
     if (icon.localName == "statusbarpanel")
     {
       if (Prefs.defaultstatusbaraction == 0)
         icon.setAttribute("popup", icon.getAttribute("context"));
       else
         icon.removeAttribute("popup");
     }
     else
     {
-      if (icon.hasAttribute("context") && Prefs.defaulttoolbaraction == 0)
+      if (Prefs.defaulttoolbaraction == 0)
         icon.setAttribute("type", "menu");
       else
         icon.setAttribute("type", "menu-button");
     }
 
     icon.setAttribute("abpstate", state);
   },
 
   /**
    * Shows or hides status bar icons in all windows, according to pref.
@@ skipping 818 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);
 });