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);

[Felix Dahlke, 2013/11/10 01:07:00]

We don't typically align things on column.

-    this.onActivated      = new TabEventTarget(tab, "activate",       false);
-    this.onRemoved        = new TabEventTarget(tab, "close",          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 63 matching lines @@
         this._values.splice(idx, 1);
 
         tab.removeEventListener("close", this._onClosed, false);
       }
     },
     _onClosed: function(event)
     {
       this._delete(event.target);
     }
   };
-  TabMap.prototype["delete"] = function(tab) {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

[Felix Dahlke, 2013/11/12 09:50:24]

This hasn't been addressed.

+  TabMap.prototype["delete"] = function(tab)
+  {
     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) {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

-        return new Tab(tab);
-      }));
+      callback(this._win.tabs.map(function(tab) { return new Tab(tab); }));
     },
     getActiveTab: function(callback)
     {
       callback(new Tab(this._win.activeTab));
     },
     openTab: function(url, callback)
     {
       var tab = this._win.openTab();
       tab.url = url;
 
@@ skipping 44 matching lines @@
               return memo.specs[idx];
 
             var spec = {type: "array"};
             memo.specs.push(spec);
             memo.arrays.push(obj);
 
             spec.items = this.serializeSequence(obj, objects, memo);
             return spec;
           }
 
-          if (obj.constructor != Date)
-          if (obj.constructor != RegExp)

[Felix Dahlke, 2013/11/10 01:07:00]

How about && instead of nested ifs?

+          if (obj.constructor != Date && obj.constructor != RegExp)
             return {type: "object", objectId: this.registerObject(obj, objects)};
         }
 
         return {type: "value", value: obj};
       },
       createCallback: function(callbackId, tab)
       {
         var proxy = this;
 
         return function()
         {
           var idx = proxy.tabs.indexOf(tab);
 
           if (idx != -1) {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

             var objects = proxy.objects[idx];
 
-            tab.page.dispatchMessage("proxyCallback", {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

+            tab.page.dispatchMessage("proxyCallback",
+            {
               callbackId: callbackId,
               contextId: proxy.registerObject(this, objects),
               args: proxy.serializeSequence(arguments, objects)
             });
           }
         };
       },
       deserialize: function(spec, objects, tab, memo)
       {
         switch (spec.type)
@@ skipping 72 matching lines @@
       },
       _handleMessage: function(message, tab)
       {
         var objects = this.getObjectCache(tab);
 
         switch (message.type)
         {
           case "getProperty":
             var obj = objects[message.objectId];
 
-            try {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

+            try
+            {
               var value = obj[message.property];
             }
             catch (e)
             {
               return this.fail(e);
             }
 
             return {succeed: true, result: this.serialize(value, objects)};
           case "setProperty":
             var obj = objects[message.objectId];
             var value = this.deserialize(message.value, objects, tab);
 
-            try {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

+            try
+            {
               obj[message.property] = value;
             }
             catch (e)
             {
               return this.fail(e);
             }
 
             return {succeed: true};
           case "callFunction":
             var func = objects[message.functionId];
             var context = objects[message.contextId];
 
             var args = [];
             for (var i = 0; i < message.args.length; i++)
               args.push(this.deserialize(message.args[i], objects, tab));
 
-            try {

[Felix Dahlke, 2013/11/10 01:07:00]

Opening brace should go on its own line.

+            try
+            {
               var result = func.apply(context, args);
             }
             catch (e)
             {
               return this.fail(e);
             }
 
             return {succeed: true, result: this.serialize(result, objects)};
           case "inspectObject":
             var obj = objects[message.objectId];
@@ skipping 28 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)

[Felix Dahlke, 2013/11/10 01:07:00]

As above, I'd prefer a logical operator to nested ifs here.

[Sebastian Noack, 2013/11/10 14:40:09]

Think of it as a more readable alternative way of AND'ing conditions, that won't
fit all on one line.

[Felix Dahlke, 2013/11/10 14:48:32]

I think it's pretty confusing, why not just wrap the line after the logical
operator like we always do?

if ((!regex || regex.test(message)) &&
    this._listeners[i](message.url, message.type, tab, 0, -1) === false)

But since we appear to disagree here, let's hear what Wladimir says.

[Wladimir Palant, 2013/11/12 10:37:02]

I agree with Felix. Please use && and insert a line break. I generally put
brackets about the if body in such cases, even for one-lines, otherwise the
indentation might be confusing.

In case you intentionally didn't indent the second if block - please don't do
that.

+            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 58 matching lines @@
       }));
     },
     getLastFocused: function(callback)
     {
       callback(new Window(safari.application.activeBrowserWindow));
     }
   };
 
   ext.tabs = {
     onBeforeNavigate: new TabEventTarget(safari.application, "beforeNavigate", true),
-    onCompleted:      new TabEventTarget(safari.application, "navigate",       true),

[Felix Dahlke, 2013/11/10 01:07:00]

We typically don't align things on column.

-    onActivated:      new TabEventTarget(safari.application, "activate",       true),
-    onRemoved:        new TabEventTarget(safari.application, "close",          true)
+    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);
 })();