Added Safari Support

safari/common.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 50 matching lines @@
 
 
   MessageEventTarget = function(target)
   {
     WrappedEventTarget.call(this, target, "message", false);
   };
   MessageEventTarget.prototype = {
     __proto__: WrappedEventTarget.prototype,
     _wrapListener: function(listener)
     {
-      return function(event) {

[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.

+      return function(event)
+      {
         if (event.name.indexOf("request-") != 0)
           return;
 
         var sender = {};
         var dispatcher;
 
-        if (event.target instanceof SafariBrowserTab)
+        if ("SafariBrowserTab" in window && event.target instanceof SafariBrowserTab)
         {
           dispatcher = event.target.page;
           sender.tab = new Tab(event.target);
         }
         else
         {
           dispatcher = event.target.tab;
           sender.tab = null;
         }
 
-        listener(event.message, sender, function(message) {

[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.

+        listener(event.message, sender, function(message)
+        {
           dispatcher.dispatchMessage("response-" + event.name.substr(8), message);
         });
       };
     }
   };
 
 
   /* Message passing */
 
   var requestCounter = 0;
 
   sendMessage = function(message, responseCallback)
   {
     var requestId = ++requestCounter;
 
-    if (responseCallback) {

[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.

+    if (responseCallback)
+    {
       var eventTarget = this._eventTarget;
       var responseListener = function(event)
       {
         if (event.name == "response-" + requestId)
         {
           eventTarget.removeEventListener("message", responseListener, false);
           responseCallback(event.message);
         }
       };
       eventTarget.addEventListener("message", responseListener, false);
     }
 
     this._messageDispatcher.dispatchMessage("request-" + requestId, message);
   };
 
 
   /* I18n */
 
   var I18n = function()
   {
     this._localeCandidates = this._getLocaleCandidates();
     this._uiLocale = this._localeCandidates[0];
   };
   I18n.prototype = {
     _getLocaleCandidates: function()
     {
-      var bits, i, locale;

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

We typically declare variables where they are first used.

       var candidates = [];
-      var default_locale = "en_US";

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

camelCase please :)

-
+      var defaultLocale = "en_US";
+
+      var bits, i;
       for (i = (bits = navigator.language.split("-")).length; i > 0; i--)
       {
-        locale = bits.slice(0, i).join("_");
+        var locale = bits.slice(0, i).join("_");
         candidates.push(locale);
 
-        if (locale == default_locale)
+        if (locale == defaultLocale)
           return candidates;
       }
 
-      candidates.push(default_locale);
+      candidates.push(defaultLocale);
       return candidates;
     },
     _getCatalog: function(locale)
     {
       var xhr = new XMLHttpRequest();
       
       xhr.open("GET", safari.extension.baseURI + "_locales/" + locale + "/messages.json", false);
 
       try {
         xhr.send();
       }
       catch (e)
       {
         return null;
       }
 
       return JSON.parse(xhr.responseText);
     },
     getMessage: function(msgId, substitutions)
     {
       if (msgId == "@@ui_locale")
         return this._uiLocale;
 
       for (var i = 0; i < this._localeCandidates.length; i++)
       {
         var catalog = this._getCatalog(this._localeCandidates[i]);
         if (!catalog)
         {
           // if there is no catalog for this locale
-          // candidate, dont"t try to load it again

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

Typo: s/dont"t/don't/

+          // candidate, don't try to load it again
           this._localeCandidates.splice(i--, 1);
           continue;
         }
 
         var msg = catalog[msgId];
         if (!msg)
           continue;
 
         var msgstr = msg.message;
         if (!msgstr)
@@ skipping 31 matching lines @@
   /* API */
 
   ext = {
     getURL: function(path)
     {
       return safari.extension.baseURI + path;
     },
     i18n: new I18n()
   };
 })();