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

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 61 matching lines @@
 function removeDeprecatedOptions()
 {
   var deprecatedOptions = ["specialCaseYouTube", "experimental", "disableInlineTextAds"];
   deprecatedOptions.forEach(function(option)
   {
     if (option in localStorage)
       delete localStorage[option];
   });
 }
 
-// Sets options to defaults, upgrading old options from previous versions as necessary
-function setDefaultOptions()
-{
-  function defaultOptionValue(opt, val)
-  {
-    if(!(opt in localStorage))
-      localStorage[opt] = val;
-  }
-
-  defaultOptionValue("shouldShowBlockElementMenu", "true");
-
-  removeDeprecatedOptions();
-}
-
-// Upgrade options before we do anything else.
-setDefaultOptions();
+// Remove deprecated options before we do anything else.
+removeDeprecatedOptions();
 
 var activeNotification = null;
 
 // Adds or removes browser action icon according to options.
 function refreshIconAndContextMenu(tab)
 {
   if(!/^https?:/.test(tab.url))
     return;
 
   var iconFilename;
   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
   {
     var excluded = isWhitelisted(tab.url);
     iconFilename = excluded ? "icons/abp-19-whitelisted.png" : "icons/abp-19.png";
   }
 
   tab.browserAction.setIcon(iconFilename);
-  tab.browserAction.setTitle(ext.i18n.getMessage("name"));
-
   iconAnimation.registerTab(tab, iconFilename);
 
   // Set context menu status according to whether current tab has whitelisted domain
   if (excluded)
-    chrome.contextMenus.removeAll();
-  else
-    showContextMenu();
+    ext.contextMenus.hideMenuItems();
+  else
+    ext.contextMenus.showMenuItems();
 }
 
 /**
  * Old versions for Opera stored patterns.ini in the localStorage object, this
  * will import it into FilterStorage properly.
  * @return {Boolean} true if data import is in progress
  */
 function importOldData()
 {
   if ("patterns.ini" in localStorage)
@@ skipping 97 matching lines @@
 
           notifyUser();
       }
     }, false);
     request.send(null);
   }
   else
     notifyUser();
 }
 
-// Set up context menu for user selection of elements to block
-function showContextMenu()
-{
-  ext.contextMenus.removeAll(function()
-  {
-    if(typeof localStorage["shouldShowBlockElementMenu"] == "string" && localStorage["shouldShowBlockElementMenu"] == "true")
-    {
-      ext.contextMenus.create(ext.i18n.getMessage("block_element"), ["image", "video", "audio"], function(srcUrl, tab)
-      {
-        if(srcUrl)
-          tab.sendMessage({type: "clickhide-new-filter", filter: srcUrl});
-      });
-    }
-  });
-}
+function setContextMenu()
+{
+  if (Prefs.shouldShowBlockElementMenu)
+  {
+    // Register context menu item
+    ext.contextMenus.addMenuItem(ext.i18n.getMessage("block_element"), ["image", "video", "audio"], function(srcUrl, tab)
+    {
+      if (srcUrl)
+        tab.sendMessage({type: "clickhide-new-filter", filter: srcUrl});
+    });
+  }
+  else
+    ext.contextMenus.removeMenuItems();
+}
+
+Prefs.addListener(function(name)
+{
+  if (name == "shouldShowBlockElementMenu")
+    setContextMenu();
+});
+setContextMenu();
 
 /**
   * 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)
   {
@@ skipping 87 matching lines @@
       }
 
       var requestHost = extractHostFromURL(msg.url);
       var documentHost = extractHostFromURL(sender.frame.url);
       var thirdParty = isThirdParty(requestHost, documentHost);
       var filter = defaultMatcher.matchesAny(msg.url, msg.mediatype, documentHost, thirdParty);
       if (filter instanceof BlockingFilter)
       {
         var collapse = filter.collapse;
         if (collapse == null)
-          collapse = (localStorage.hidePlaceholders != "false");
+          collapse = Prefs.hidePlaceholders;
         sendResponse(collapse);
       }
       else
         sendResponse(false);
       break;
     case "get-domain-enabled-state":
       // Returns whether this domain is in the exclusion list.
       // The browser action popup asks us this.
       if(sender.tab)
       {
@@ skipping 50 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);