Made browser actions per tab on Safari

safari/ext/background.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 63 matching lines @@
     }
   };
 
 
   /* Tabs */
 
   Tab = function(tab)
   {
     this._tab = tab;
 
-    this.browserAction = new TabBrowserAction(this);
+    this.browserAction = new BrowserAction(this);
 
     this.onLoading = new LoadingTabEventTarget(tab);
     this.onBeforeNavigate = new TabEventTarget(tab, "beforeNavigate", false);
     this.onCompleted = new TabEventTarget(tab, "navigate", false);
     this.onActivated = new TabEventTarget(tab, "activate", false);
     this.onRemoved = new TabEventTarget(tab, "close", false);
   };
   Tab.prototype = {
     get url()
     {
@@ skipping 87 matching lines @@
     onLoading: new LoadingTabEventTarget(safari.application),
     onBeforeNavigate: new TabEventTarget(safari.application, "beforeNavigate", true),
     onCompleted: new TabEventTarget(safari.application, "navigate", true),
     onActivated: new TabEventTarget(safari.application, "activate", true),
     onRemoved: new TabEventTarget(safari.application, "close", true)
   };
 
 
   /* Browser actions */
 
-  var toolbarItemProperites = {};

[Wladimir Palant, 2014/01/16 09:10:05]

toolbarItemProperites => toolbarItemProperties?

[Sebastian Noack, 2014/01/16 12:45:02]

Done.

+  var toolbarItemProperties = {};
 
   var getToolbarItemProperty = function(name)
   {
-    var property = toolbarItemProperites[name];
+    var property = toolbarItemProperties[name];
     if (!property)
     {
-      property = {global: safari.extension.toolbarItems[0][name], tabs: new TabMap()};

[Wladimir Palant, 2014/01/16 09:10:05]

Will there always be at least one toolbar item? What if all Safari windows are
closed?

[Sebastian Noack, 2014/01/16 12:45:02]

Done.

-      toolbarItemProperites[name] = property;
+      property = {tabs: new TabMap()};
+      toolbarItemProperties[name] = property;
     }
     return property;
   };
 
   var getToolbarItemForWindow = function(win)
   {
     for (var i = 0; i < safari.extension.toolbarItems.length; i++)
     {
       var toolbarItem = safari.extension.toolbarItems[i];
 
       if (toolbarItem.browserWindow == win)
         return toolbarItem;
     }
 
     return null;
   };
 
-  var BrowserAction = function() {};
+  var BrowserAction = function(tab)
+  {
+    this._tab = tab;
+  };
   BrowserAction.prototype = {
+    _set: function(name, value)
+    {
+      var currentWindow = this._tab._tab.browserWindow;
+      var toolbarItem = getToolbarItemForWindow(currentWindow);
+
+      if (toolbarItem)
+      {
+        var property = getToolbarItemProperty(name);
+        property.tabs.set(this._tab, value);
+
+        if (!("global" in property))
+          property.global = toolbarItem[name];
+
+        if (this._tab._tab == currentWindow.activeTab)
+          toolbarItem[name] = value;
+      }
+    },
     setIcon: function(path)
     {
       this._set("image", safari.extension.baseURI + path);
     },
     setTitle: function(title)
     {
       this._set("label", title);
       this._set("toolTip", title);
     },
     setBadge: function(badge)
     {
       if (!badge)
         this._set("badge", 0);
       else if ("number" in badge)
         this._set("badge", badge.number);
     }
   };
 
-  var GlobalBrowserAction = function() {};
-  GlobalBrowserAction.prototype = {
-    __proto__: BrowserAction.prototype,
-    _set: function(name, value)
-    {
-      var property = getToolbarItemProperty(name);
-      property.global = value;
-      property.tabs.clear();
-
-      for (var i = 0; i < safari.extension.toolbarItems.length; i++)
-        safari.extension.toolbarItems[i][name] = value;
-    }
-  };
-
-  ext.browserAction = new GlobalBrowserAction();
-
-  var TabBrowserAction = function(tab)
-  {
-    this._tab = tab;
-  };
-  TabBrowserAction.prototype = {
-    __proto__: BrowserAction.prototype,
-    _set: function(name, value)
-    {
-      getToolbarItemProperty(name).tabs.set(this._tab, value);
-
-      var currentWindow = this._tab._tab.browserWindow;
-      var toolbarItem = getToolbarItemForWindow(currentWindow);
-      if (toolbarItem && this._tab._tab == currentWindow.activeTab)

[Wladimir Palant, 2014/01/16 09:10:05]

Nit: It seems that |this._tab._tab == currentWindow.activeTab| should be checked
first - before going through all the effort finding the right toolbar item.

-        toolbarItem[name] = value;
-    }
-  };
-
   ext.tabs.onActivated.addListener(function(tab)
   {
     var toolbarItem = getToolbarItemForWindow(tab._tab.browserWindow);
 
     if (!toolbarItem)
       return;
 
-    for (var name in toolbarItemProperites)
-    {
-      var property = toolbarItemProperites[name];
+    for (var name in toolbarItemProperties)
+    {
+      var property = toolbarItemProperties[name];
 
       if (property.tabs.has(tab))
         toolbarItem[name] = property.tabs.get(tab);
       else
         toolbarItem[name] = property.global;
     }
   });
 
 
   /* Windows */
@@ skipping 348 matching lines @@
   };
 
   ext.onMessage = new BackgroundMessageEventTarget();
 
   // TODO: Implement context menu
   ext.contextMenus = {
     create: function(title, contexts, onclick) {},
     removeAll: function(callback) {}
   };
 })();