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

lib/ui.js

Index: lib/ui.js
===================================================================
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -445,21 +445,21 @@ let UI = exports.UI =
 
       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);
     });
@@ -1126,17 +1126,17 @@ let UI = exports.UI =
     {
       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);
   },