Added Safari Support

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 11 matching lines @@
   var TabEventTarget = function()
   {
     WrappedEventTarget.apply(this, arguments);
   };
   TabEventTarget.prototype = {
     __proto__: WrappedEventTarget.prototype,
     _wrapListener: function(listener)
     {
       return function(event)
       {
-        listener(new Tab(event.target));
+        if (event.target instanceof SafariBrowserTab)
+          listener(new Tab(event.target));
       };
     }
   };
 
   Tab = function(tab)
   {
     this._tab = tab;
 
     this._eventTarget = tab;
     this._messageDispatcher = tab.page;
-
-    this.url = tab.url;
 
     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()
+    {
+      return this._tab.url;
+    },
     close: function()
     {
       this._tab.close();
     },
     activate: function()
     {
       this._tab.activate();
     },
     sendMessage: sendMessage,
     pageAction: {
@@ skipping 74 matching lines @@
   {
     this._delete(tab._tab);
   };
 
 
   /* Windows */
 
   Window = function(win)
   {
     this._win = win;
-    this.visible = win.visible;
   }
   Window.prototype = {
+    get visible()
+    {
+      return this._win.visible;
+    },
     getAllTabs: function(callback)
     {
       callback(this._win.tabs.map(function(tab) { return new Tab(tab); }));
     },
     getActiveTab: function(callback)
     {
       callback(new Tab(this._win.activeTab));
     },
     openTab: function(url, callback)
     {
@@ skipping 240 matching lines @@
         _urlPatterns: [],
 
         _handleMessage: function(message, tab)
         {
           tab = new Tab(tab);
 
           for (var i = 0; i < this._listeners.length; i++)
           {
             var regex = this._urlPatterns[i];
 
-            if (!regex || regex.test(message))
-            if (this._listeners[i](message.url, message.type, tab, 0, -1) === false)
+            if ((!regex || regex.test(message.url)) && this._listeners[i](message.url, message.type, tab, 0, -1) === false)
               return false;
           }
 
           return true;
         },
         addListener: function(listener, urls)
         {
           var regex;
 
           if (urls)
@@ skipping 71 matching lines @@
   };
 
   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);
 })();