Remove tabs from TabMap onLoading instead of onBeforeNavigate 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 146 matching lines @@
       }
     },
     has: function(tab)
     {
       return this._indexOf(tab) != -1;
     },
     clear: function()
     {
       while (this._data.length > 0)
         this.delete(this._data[0].tab);
-    }
-  };
-  TabMap.prototype["delete"] = function(tab)
-  {
-    var idx = this._indexOf(tab);
-
-    if (idx != -1)
-    {
-      tab = this._data[idx].tab;
-      this._data.splice(idx, 1);
-
-      tab.onRemoved.removeListener(this._delete);
-      tab.onLoading.removeListener(this.delete);
+    },
+    delete: function(tab)
+    {
+      var idx = this._indexOf(tab);
+
+      if (idx != -1)
+      {
+        tab = this._data[idx].tab;
+        this._data.splice(idx, 1);
+
+        tab.onRemoved.removeListener(this._delete);
+        tab.onLoading.removeListener(this.delete);
+      }
     }
   };
 
   ext.tabs = {
     onLoading: new LoadingTabEventTarget(safari.application),
     onCompleted: new TabEventTarget(safari.application, "navigate", true),
     onActivated: new TabEventTarget(safari.application, "activate", true),
     onRemoved: new TabEventTarget(safari.application, "close", true)
   };
 
@@ skipping 516 matching lines @@
     for (var i = 0; i < contextMenuItems.length; i++)
     {
       if (contextMenuItems[i].id == event.command)
       {
         contextMenuItems[i].onclick(event.userInfo.srcUrl, new Tab(safari.application.activeBrowserWindow.activeTab));
         break;
       }
     }
   }, false);
 })();