Remove tabs from TabMap onLoading instead of onBeforeNavigate on Safari

chrome/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 226 matching lines @@
     }
   };
 
   Tab = function(tab)
   {
     this._id = tab.id;
     this._url = tab.url;
 
     this.browserAction = new BrowserAction(tab.id);
 
-    this.onBeforeNavigate = ext.tabs.onBeforeNavigate._bindToTab(this);
     this.onLoading = ext.tabs.onLoading._bindToTab(this);
     this.onCompleted = ext.tabs.onCompleted._bindToTab(this);
     this.onActivated = ext.tabs.onActivated._bindToTab(this);
     this.onRemoved = ext.tabs.onRemoved._bindToTab(this);
+
+    // the "beforeNavigate" event in Safari isn't dispatched when a new URL
+    // was entered into the address bar. So we can only use it only on Chrome,
+    // but we have to hide it from the browser-independent high level code.
+    this._onBeforeNavigate = ext.tabs._onBeforeNavigate._bindToTab(this);
   };
   Tab.prototype = {
     get url()
     {
       // usually our Tab objects are created from chrome Tab objects, which
       // provide the url. So we can return the url given in the constructor.
       if (this._url != null)
         return this._url;
 
       // but sometimes we only have the id when we create a Tab object.
@@ skipping 14 matching lines @@
     activate: function()
     {
       chrome.tabs.update(this._id, {selected: true});
     },
     sendMessage: function(message, responseCallback)
     {
       sendMessage(this._id, message, responseCallback);
     }
   };
 
-  TabMap = function(deleteTabOnBeforeNavigate)
+  TabMap = function(deleteOnPageUnload)
   {
     this._map = {};
 
     this._delete = this._delete.bind(this);
-    this._deleteTabOnBeforeNavigate = deleteTabOnBeforeNavigate;
+    this._deleteOnPageUnload = deleteOnPageUnload;
   };
   TabMap.prototype = {
     get: function(tab)
     {
       return (this._map[tab._id] || {}).value;
     },
     set: function(tab, value)
     {
       if (!(tab._id in this._map))
       {
         tab.onRemoved.addListener(this._delete);
-        if (this._deleteTabOnBeforeNavigate)
-          tab.onBeforeNavigate.addListener(this._delete);
+        if (this._deleteOnPageUnload)
+          tab._onBeforeNavigate.addListener(this._delete);
       }
 
       this._map[tab._id] = {tab: tab, value: value};
     },
     has: function(tab)
     {
       return tab._id in this._map;
     },
     clear: function()
     {
       for (var id in this._map)
         this.delete(this._map[id].tab);
     },
     _delete: function(tab)
     {
       // delay so that other event handlers can still lookup this tab
       setTimeout(this.delete.bind(this, tab), 0);
+    },
+    delete: function(tab)
+    {
+      delete this._map[tab._id];
+
+      tab.onRemoved.removeListener(this._delete);
+      tab._onBeforeNavigate.removeListener(this._delete);
     }
   };
-  TabMap.prototype["delete"] = function(tab)
-  {
-    delete this._map[tab._id];
-
-    tab.onRemoved.removeListener(this._delete);
-    tab.onBeforeNavigate.removeListener(this._delete);
-  };
 
 
   /* Windows */
 
   Window = function(win)
   {
     this._id = win.id;
     this.visible = win.status != "minimized";
   };
   Window.prototype = {
@@ skipping 165 matching lines @@
     getLastFocused: function(callback)
     {
       chrome.windows.getLastFocused(function(win)
       {
         callback(new Window(win));
       });
     }
   };
 
   ext.tabs = {
-    onBeforeNavigate: new BeforeNavigateTabEventTarget(),
     onLoading: new LoadingTabEventTarget(),
     onCompleted: new CompletedTabEventTarget(),
     onActivated: new ActivatedTabEventTarget(),
-    onRemoved: new RemovedTabEventTarget()
+    onRemoved: new RemovedTabEventTarget(),
+
+    // the "beforeNavigate" event in Safari isn't dispatched when a new URL
+    // was entered into the address bar. So we can only use it only on Chrome,
+    // but we have to hide it from the browser-independent high level code.
+    _onBeforeNavigate: new BeforeNavigateTabEventTarget()
   };
 
   ext.webRequest = {
     onBeforeRequest: new SimpleEventTarget(),
     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged
   };
 
   var contextMenuItems = [];
   var isContextMenuHidden = true;
   ext.contextMenus = {
@@ skipping 38 matching lines @@
       if (isContextMenuHidden)
         return;
 
       chrome.contextMenus.removeAll();
       isContextMenuHidden = true;
     }
   };
 
   ext.onMessage = new BackgroundMessageEventTarget();
 })();