Added Safari Support

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 98 matching lines @@
 }
 
 var activeNotification = null;
 
 // Adds or removes page action icon according to options.
 function refreshIconAndContextMenu(tab)
 {
   if(!/^https?:/.test(tab.url))
     return;
 
-  var excluded = isWhitelisted(tab.url);
   var iconFilename;
-
-  // If the page is whitelisted use the grayscale version of the icon
-  // for that tab, except for Safari where all icons are grayscale
-  // already and where icons aren't per tab.
-  if ("safari" in window || !excluded)
-    iconFilename = "icons/abp-18.png";
+  if (require("info").platform == "safari")
+    // There is no grayscale version of the icon for whitelisted tabs
+    // when using Safari, because icons are grayscale already and icons
+    // aren't per tab in Safari.
+    iconFilename = "icons/abp-16.png"
   else
-    iconFilename = "icons/abp-18-whitelisted.png";
+  {
+    var excluded = isWhitelisted(tab.url);
+    iconFilename = excluded ? "icons/abp-19-whitelisted.png" : "icons/abp-19.png";
+  }
 
   tab.pageAction.setIcon(iconFilename);
-  tab.pageAction.setTitle("Adblock Plus");
+  tab.pageAction.setTitle(ext.i18n.getMessage("name"));
 
   iconAnimation.registerTab(tab, iconFilename);
 
   if (localStorage.shouldShowIcon == "false")
     tab.pageAction.hide();
   else
     tab.pageAction.show();
 
-  if ("chrome" in window) // TODO: Implement context menus for Safari
+  if (require("info").platform == "chromium") // TODO: Implement context menus for Safari
     // Set context menu status according to whether current tab has whitelisted domain
     if (excluded)
       chrome.contextMenus.removeAll();
     else
       showContextMenu();
 }
 
 /**
  * Old versions stored filter data in the localStorage object, this will import
  * it into FilterStorage properly.
@@ skipping 212 matching lines @@
     }
     else
       addAcceptable = false;
   }
 
   if (!addSubscription && !addAcceptable)
     return;
 
   function notifyUser()
   {
-    ext.windows.getLastFocused(function(win) {
+    ext.windows.getLastFocused(function(win)
+    {
       win.openTab(ext.getURL("firstRun.html"));
     });
   }
 
   if (addSubscription)
   {
     // Load subscriptions data
     var request = new XMLHttpRequest();
     request.open("GET", "subscriptions.xml");
     request.addEventListener("load", function()
@@ skipping 27 matching lines @@
     {
       chrome.contextMenus.create({"title": chrome.i18n.getMessage("block_element"), "contexts": ["image", "video", "audio"], "onclick": function(info, tab)
       {
         if(info.srcUrl)
             chrome.tabs.sendRequest(tab.id, {reqtype: "clickhide-new-filter", filter: info.srcUrl});
       }});
     }
   });
 }
 
+/**
+  * Opens options tab or focuses an existing one, within the last focused window.
+  * @param {Function} callback  function to be called with the
+                                Tab object of the options tab
+  */
 function openOptions(callback)
 {
   ext.windows.getLastFocused(function(win)
   {
     win.getAllTabs(function(tabs)
     {
       var optionsUrl = ext.getURL("options.html");
 
       for (var i = 0; i < tabs.length; i++)
+      {
         if (tabs[i].url == optionsUrl)
         {
           tabs[i].activate();
           if (callback)
             callback(tabs[i]);
           return;
         }
-
-      win.openTab(optionsUrl, callback && function(tab) {
+      }
+
+      win.openTab(optionsUrl, callback && function(tab)
+      {
         tab.onCompleted.addListener(callback);
       });
     });
   });
 }
 
 function prepareNotificationIconAndPopup()
 {
   activeNotification.onClicked = function()
   {
@@ skipping 29 matching lines @@
   for (var frameId in frames.get(tab))
     if (getFrameUrl(tab, frameId) == url)
       return frameId;
   return -1;
 }
 
 ext.onMessage.addListener(function (msg, sender, sendResponse)
 {
   switch (msg.type)
   {
-    case "get-settings":
-      var hostDomain = null;
+    case "get-selectors":
       var selectors = null;
-
       var frameId = sender.tab ? getFrameId(sender.tab, msg.frameUrl) : -1;
-      var enabled = false;
-
-      if (!isFrameWhitelisted(sender.tab, frameId, "DOCUMENT"))
-      if (!isFrameWhitelisted(sender.tab, frameId, "ELEMHIDE")) {
-        var enabled = true;
-
-        if (msg.selectors)
+
+      if (!isFrameWhitelisted(sender.tab, frameId, "DOCUMENT") &&
+          !isFrameWhitelisted(sender.tab, frameId, "ELEMHIDE"))
+      {
+        var noStyleRules = false;
+        var host = extractHostFromURL(msg.frameUrl);
+        for (var i = 0; i < noStyleRulesHosts.length; i++)
         {
-          var noStyleRules = false;
-          var host = extractHostFromURL(msg.frameUrl);
-          hostDomain = getBaseDomain(host);
-          for (var i = 0; i < noStyleRulesHosts.length; i++)
+          var noStyleHost = noStyleRulesHosts[i];
+          if (host == noStyleHost || (host.length > noStyleHost.length &&
+                                      host.substr(host.length - noStyleHost.length - 1) == "." + noStyleHost))
           {
-            var noStyleHost = noStyleRulesHosts[i];
-            if (host == noStyleHost || (host.length > noStyleHost.length &&
-                                        host.substr(host.length - noStyleHost.length - 1) == "." + noStyleHost))
-            {
-              noStyleRules = true;
-            }
-          }
-          selectors = ElemHide.getSelectorsForDomain(host, false);
-          if (noStyleRules)
-          {
-            selectors = selectors.filter(function(s)
-            {
-              return !/\[style[\^\$]?=/.test(s);
-            });
+            noStyleRules = true;
           }
         }
-      }
-
-      sendResponse({enabled: enabled, hostDomain: hostDomain, selectors: selectors});
+        selectors = ElemHide.getSelectorsForDomain(host, false);
+        if (noStyleRules)
+        {
+          selectors = selectors.filter(function(s)
+          {
+            return !/\[style[\^\$]?=/.test(s);
+          });
+        }
+      }
+
+      sendResponse(selectors);
       break;
     case "should-collapse":
       var frameId = sender.tab ? getFrameId(sender.tab, msg.documentUrl) : -1;
 
       if (isFrameWhitelisted(sender.tab, frameId, "DOCUMENT"))
       {
         sendResponse(false);
         break;
       }
 
@@ skipping 21 matching lines @@
       }
       break;
     case "add-filters":
       if (msg.filters && msg.filters.length)
       {
         for (var i = 0; i < msg.filters.length; i++)
           FilterStorage.addFilter(Filter.fromText(msg.filters[i]));
       }
       break;
     case "add-subscription":
-      openOptions(function(tab) { tab.sendMessage(msg); });
+      openOptions(function(tab)
+      {
+        tab.sendMessage(msg);
+      });
       break;
     case "forward":
       tab.sendMessage(msg.payload, sendResponse);
       break;
     default:
       sendResponse({});
       break;
   }
 });
 
 // Show icon as page action for all tabs that already exist
 ext.windows.getAll(function(windows)
 {
   for (var i = 0; i < windows.length; i++)
+  {
     windows[i].getAllTabs(function(tabs)
     {
       tabs.forEach(refreshIconAndContextMenu);
     });
+  }
 });
 
 // Update icon if a tab changes location
 ext.tabs.onBeforeNavigate.addListener(function(tab)
 {
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);