Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari

safari/ext/content.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 269 matching lines @@
   /* Web request blocking */
 
   document.addEventListener("beforeload", function(event)
   {
     var type;
 
     switch(event.target.localName)
     {
       case "frame":
       case "iframe":
-        type = "sub_rame";
+        type = "sub_frame";
         break;
       case "img":
         type = "image";
         break;
       case "object":
       case "embed":
         type = "object";
         break;
       case "script":
         type = "script";
         break;
       case "link":
         if (/\bstylesheet\b/i.test(event.target.rel))
         {
           type = "stylesheet";
           break;
         }
       default:
         type = "other";
     }
 
-    if (!safari.self.tab.canLoad(event, {

[Felix Dahlke, 2014/01/18 13:39:19]

{ should go on its own line

[Sebastian Noack, 2014/01/19 10:19:40]

Done.

-      type: "webRequest",
-      payload: {
-        url: event.url,
-        type: type,
-        documentUrl: document.location.href,
-        isTopLevel: window == window.top
-      }
-    }))
+    if (!safari.self.tab.canLoad(
+      event, {
+        type: "webRequest",
+        payload: {
+          url: event.url,
+          type: type,
+          documentUrl: document.location.href,
+          isTopLevel: window == window.top
+        }
+      }
+    ))
+    {
       event.preventDefault();
+
+      // Safari doesn't dispatch an "error" or "load" event when preventing an
+      // element from loading by cancelling the "beforeload" event. So we have
+      // to dispatch it manually. Otherwise element collapsing wouldn't work.
+      var evt = document.createEvent("Event");
+      evt.initEvent(type == "sub_frame" ? "load" : "error");
+      event.target.dispatchEvent(evt);
+    }
   }, true);
 
 
   /* API */
 
   ext.backgroundPage = {
-    sendMessage: function(message, responseCallback) {

[Felix Dahlke, 2014/01/18 13:39:19]

{ should go on its own line

[Sebastian Noack, 2014/01/19 10:19:40]

Done.

+    sendMessage: function(message, responseCallback)
+    {
       _sendMessage(
         message, responseCallback,
         safari.self.tab, safari.self,
         {
           documentUrl: document.location.href,
           isTopLevel: window == window.top
         }
       );
     },
     getWindow: function()
     {
       return proxy.getObject(0);
     }
   };
 
   ext.onMessage = new ContentMessageEventTarget();
+
+
+  // Safari does not pass the element which the context menu is refering to
+  // so we need to add it to the event's user info.
+  document.addEventListener("contextmenu", function(event)
+  {
+    var element = event.srcElement;
+    safari.self.tab.setContextMenuEventUserInfo(event, {
+      srcUrl: ("src" in element) ? element.src : null,
+      tagName: element.localName
+    });
+  }, false);
 })();