Added Safari Support

block.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 @@
   window.addEventListener("dragstart", onDragStart, false);
   window.addEventListener("drag", onDrag, false);
   window.addEventListener("dragend", onDragEnd, false);
 
   $("#addButton").click(addFilters);
   $("#cancelButton").click(closeDialog.bind(null, false));
 
   // Apply jQuery UI styles
   $("button").button();
 
-  chrome.extension.sendRequest(
+  ext.backgroundPage.sendMessage({

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

I know the coding style put this differently, but I guess we should put the
opening brace on a new line here even though it's an object literal, that's how
the code looked before.

I changed that in the coding style. The object literal exception was basically
only because putting the opening brace on a new line after = won't work.

+    type: "forward",
+    payload:
     {
-      reqtype: "forward",
-      request:
-      {
-        reqtype: "clickhide-init",
-        width: Math.max(document.body.offsetWidth || document.body.scrollWidth),
-        height: Math.max(document.body.offsetHeight || document.body.scrollHeight)
-      }
-    },
-    function(response)
-    {
-      document.getElementById("filters").value = response.filters.join("\n");
+      type: "clickhide-init",
+      width: Math.max(document.body.offsetWidth || document.body.scrollWidth),
+      height: Math.max(document.body.offsetHeight || document.body.scrollHeight)
     }
-  );
+  },
+  function(response) {

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

Opening brace should go on its own line.

+    document.getElementById("filters").value = response.filters.join("\n");
+  });
 
   document.getElementById("filters").focus();
 }
 $(init);
 
 function onKeyDown(event)
 {
   if (event.keyCode == 27)
   {
     event.preventDefault();
     closeDialog();
   }
   else if (event.keyCode == 13 && !event.shiftKey && !event.ctrlKey)
   {
     event.preventDefault();
     addFilters();
   }
 }
 
 function addFilters()
 {
   // Tell the background page to add the filters
   var filters = document.getElementById("filters").value.split(/[\r\n]+/)
                         .map(function(f) {return f.replace(/^\s+/, "").replace(/\s+$/, "");})
                         .filter(function(f) {return f != "";});
-  chrome.extension.sendRequest({reqtype: "add-filters", filters: filters});
+  ext.backgroundPage.sendMessage({type: "add-filters", filters: filters});
   closeDialog(true);
 }
 
 function closeDialog(success)
 {
-  chrome.extension.sendRequest(
+  ext.backgroundPage.sendMessage(
     {
-      reqtype: "forward",
-      request:
+      type: "forward",
+      payload:
       {
-        reqtype: "clickhide-close",
+        type: "clickhide-close",
         remove: (typeof success == "boolean" ? success : false)
       }
     }
   );
 }
 
 var dragCoords = null;
 function onDragStart(event)
 {
   dragCoords = [event.screenX, event.screenY];
 }
 
 function onDrag(event)
 {
   if (!dragCoords)
     return;
 
   if (!event.screenX && !event.screenY)
     return;
 
   var diff = [event.screenX - dragCoords[0], event.screenY - dragCoords[1]];
   if (diff[0] || diff[1])
   {
-    chrome.extension.sendRequest(
+    ext.backgroundPage.sendMessage(
       {
-        reqtype: "forward",
-        request:
+        type: "forward",
+        payload:
         {
-          reqtype: "clickhide-move",
+          type: "clickhide-move",
           x: diff[0],
           y: diff[1]
         }
       }
     );
     dragCoords = [event.screenX, event.screenY];
   }
 }
 
 function onDragEnd(event)
 {
   onDrag(event);
   dragCoords = null;
 }