Added Safari Support

popup.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var backgroundPage = chrome.extension.getBackgroundPage();
+var backgroundPage = ext.backgroundPage.getDOMWindow();
 var imports = ["require", "isWhitelisted", "extractHostFromURL", "refreshIconAndContextMenu"];
 for (var i = 0; i < imports.length; i++)
   window[imports[i]] = backgroundPage[imports[i]];
 
 var Filter = require("filterClasses").Filter;
 var FilterStorage = require("filterStorage").FilterStorage;
 
 var tab = null;
 
 function init()
 {
   // Attach event listeners
   $("#enabled").click(toggleEnabled);
   $("#clickHideButton").click(activateClickHide);
   $("#cancelButton").click(cancelClickHide);
+  $("#optionsButton").click(openOptions);
 
   // Ask content script whether clickhide is active. If so, show cancel button.
   // If that isn't the case, ask background.html whether it has cached filters. If so,
   // ask the user whether she wants those filters.
   // Otherwise, we are in default state.
-  chrome.windows.getCurrent(function(w)
-  {
-    chrome.tabs.getSelected(w.id, function(t)
-    {
+  ext.windows.getLastFocused(function(win) {
+    win.getActiveTab(function(t) {
       tab = t;
       document.getElementById("enabled").checked = !isWhitelisted(tab.url);
       document.getElementById("enabledCheckboxAndLabel").style.display = "block";
 
-      chrome.tabs.sendRequest(tab.id, {reqtype: "get-clickhide-state"}, function(response)
-      {
+      tab.sendMessage({type: "get-clickhide-state"}, function(response) {
         if(response.active)
           clickHideActiveStuff();
         else
           clickHideInactiveStuff();
       });
     });
   });
 }
 $(init);
 
@@ skipping 24 matching lines @@
       FilterStorage.addFilter(filter);
     }
   }
 
   refreshIconAndContextMenu(tab);
 }
 
 function activateClickHide()
 {
   clickHideActiveStuff();
-  chrome.tabs.sendRequest(tab.id, {reqtype: "clickhide-activate"});
+  tab.sendMessage({type: "clickhide-activate"});
 
   // Close the popup after a few seconds, so user doesn't have to
   activateClickHide.timeout = window.setTimeout(window.close, 5000);
 }
 
 function cancelClickHide()
 {
   if (activateClickHide.timeout)
   {
     window.clearTimeout(activateClickHide.timeout);
     activateClickHide.timeout = null;
   }
   clickHideInactiveStuff();
-  chrome.tabs.sendRequest(tab.id, {reqtype: "clickhide-deactivate"});
+  tab.sendMessage({type: "clickhide-deactivate"});
+}
+
+function openOptions() {

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

Opening brace should go on its own line.

+  backgroundPage.openOptions();
 }
 
 function clickHideActiveStuff()
 {
   document.getElementById("enabledCheckboxAndLabel").style.display = "none";
   document.getElementById("clickHideInactiveStuff").style.display = "none";
   document.getElementById("clickHideActiveStuff").style.display = "inherit";
 }
 
 function clickHideInactiveStuff()
 {
   document.getElementById("enabledCheckboxAndLabel").style.display = "block";
   document.getElementById("clickHideActiveStuff").style.display = "none";
   document.getElementById("clickHideInactiveStuff").style.display = "inherit";
 }