Fixed reload issue in Chrome

safari/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 17 matching lines @@
     _wrapListener: function(listener)
     {
       return function(event)
       {
         if (event.target instanceof SafariBrowserTab)
           listener(new Tab(event.target));
       };
     }
   };
 
+  var LoadingTabEventTarget = function(target)
+  {
+    WrappedEventTarget.call(this, target, "message", false);
+  };
+  LoadingTabEventTarget.prototype = {
+    __proto__: WrappedEventTarget.prototype,
+    _wrapListener: function(listener)
+    {
+      return function (event) {
+        if (event.name == "loading" && event.message == event.target.url)

[Felix Dahlke, 2013/11/15 13:28:38]

Shouldn't we check if event.target is an instance of SafariBrowserTab here, as
for the other events?

[Sebastian Noack, 2013/11/15 13:45:29]

Shouldn't be required here. Only tabs can send messages to the background page.
While the other events can also have an instance of SafariBrowserWindow in
event.target, and therefore require that check.

+          listener(new Tab(event.target));
+      };
+    }
+  };
+
   Tab = function(tab)
   {
     this._tab = tab;
 
     this._eventTarget = tab;
     this._messageDispatcher = tab.page;
 
-    this.onBeforeNavigate = new TabEventTarget(tab, "beforeNavigate", false);
+    this.onLoading = new LoadingTabEventTarget(tab);
     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()
     {
       return this._tab.url;
     },
     close: function()
@@ skipping 427 matching lines @@
         return new Window(win);
       }));
     },
     getLastFocused: function(callback)
     {
       callback(new Window(safari.application.activeBrowserWindow));
     }
   };
 
   ext.tabs = {
-    onBeforeNavigate: new TabEventTarget(safari.application, "beforeNavigate", true),
+    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)
   };
 
   ext.backgroundPage = {
     getWindow: function()
     {
       return safari.extension.globalPage.contentWindow;
     }
   };
 
   ext.onMessage = new MessageEventTarget(safari.application);
 
 
   // Safari will load the bubble once, and then show it everytime the icon is
   // clicked. While Chrome loads it everytime you click the icon. So in order to
   // force the same behavior in Safari, we are going to reload the page of the
   // bubble everytime it is shown.
   if (safari.extension.globalPage.contentWindow != window)
     safari.application.addEventListener("popover", function()
     {
       document.documentElement.style.display = "none";
       document.location.reload();
     }, true);
 })();