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

safari/ext/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 609 matching lines @@
 
   ext.backgroundPage = {
     getWindow: function()
     {
       return safari.extension.globalPage.contentWindow;
     }
   };
 
   ext.onMessage = new BackgroundMessageEventTarget();
 
-  var contextMenu = [];
-  var isContextMenuHidden = false;
+  var contextMenuItems = [];
+  var isContextMenuHidden = true;
   ext.contextMenus = {
     addMenuItem: function(title, contexts, onclick)
     {
-      contextMenu.push({
-        id: "block-element", 
+      contextMenuItems.push({
+        id: String(contextMenuItems.length), 
         title: title,
         item: null,
         contexts: contexts,
         onclick: onclick
       });
+      this.showMenuItems();
     },
     removeMenuItems: function()
     {
-      contextMenu = [];
-    },
-    showMenu: function()
+      contextMenuItems = [];
+      this.hideMenuItems();
+    },
+    showMenuItems: function()
     {
       isContextMenuHidden = false;
     },
-    hideMenu: function()
+    hideMenuItems: function()
     {
       isContextMenuHidden = true;
     }
   };
 
   // Create context menu items
   safari.application.addEventListener("contextmenu", function(event)
   {
-    var context = event.userInfo.tagName.toLowerCase();
+    if (isContextMenuHidden)
+      return;
+
+    var context = event.userInfo.tagName;
     if (context == "img")
       context = "image";
-
-    for (var i = 0; i < contextMenu.length; i++)
-    {
-      if (isContextMenuHidden)
-        return;
-
+    if (!event.userInfo.srcUrl)
+      context = null;
+
+    for (var i = 0; i < contextMenuItems.length; i++)
+    {
       // Supported contexts are: all, audio, image, video
-      var menuItem = contextMenu[i];
+      var menuItem = contextMenuItems[i];
       if (menuItem.contexts.indexOf("all") == -1 && menuItem.contexts.indexOf(context) == -1)
-        return;
+        continue;
       
-      menuItem.item = event.contextMenu.appendContextMenuItem(menuItem.id, menuItem.title);
+      event.contextMenu.appendContextMenuItem(menuItem.id, menuItem.title);
     }
   }, false);
 
   // Handle context menu item clicks
   safari.application.addEventListener("command", function(event)
   {
-    for (var i = 0; i < contextMenu.length; i++)
-    {
-      if (contextMenu[i].id == event.command)
-      {
-        contextMenu[i].onclick(event.userInfo.srcUrl, new Tab(safari.application.activeBrowserWindow.activeTab));
+    for (var i = 0; i < contextMenuItems.length; i++)
+    {
+      if (contextMenuItems[i].id == event.command)
+      {
+        contextMenuItems[i].onclick(event.userInfo.srcUrl, new Tab(safari.application.activeBrowserWindow.activeTab));
         break;
       }
     }
   }, false);
 })();