adblockplusopera: Update code from ABP for Chrome

options.js

 var backgroundPage = opera.extension.bgProcess;
-var imports = ["FilterStorage", "FilterNotifier", "Subscription", "SpecialSubscription",
-               "DownloadableSubscription", "Filter", "WhitelistFilter",
-               "Synchronizer", "Prefs", "Utils", "require"];
-for (var i = 0; i < imports.length; i++)
-  window[imports[i]] = backgroundPage[imports[i]];
+var require = backgroundPage.require;
+
+with(require("filterClasses"))
+{
+  this.Filter = Filter;
+  this.WhitelistFilter = WhitelistFilter;
+}
+with(require("subscriptionClasses"))
+{
+  this.Subscription = Subscription;
+  this.SpecialSubscription = SpecialSubscription;
+  this.DownloadableSubscription = DownloadableSubscription;
+}
+var FilterStorage = require("filterStorage").FilterStorage;
+var FilterNotifier = require("filterNotifier").FilterNotifier;
+var Prefs = require("prefs").Prefs;
+var Synchronizer = require("synchronizer").Synchronizer;
 
 // Loads options from localStorage and sets UI elements accordingly
 function loadOptions()
 {
   // Set page title to i18n version of "Adblock Plus Options"
   document.title = i18n.getMessage("options");
 
   // Set links
   $("#acceptableAdsLink").attr("href", Prefs.subscriptions_exceptionsurl);
-  $("#acceptableAdsDocs").attr("href", Prefs.documentation_link.replace(/%LINK%/g, "acceptable_ads").replace(/%LANG%/g, Utils.appLocale));
+  $("#acceptableAdsDocs").attr("href", Prefs.documentation_link.replace(/%LINK%/g, "acceptable_ads").replace(/%LANG%/g, require("utils").Utils.appLocale));
 
   // Add event listeners
   window.addEventListener("unload", unloadOptions, false);
   $("#updateFilterLists").click(updateFilterLists);
   $("#startSubscriptionSelection").click(startSubscriptionSelection);
   $("#subscriptionSelector").change(updateSubscriptionSelection);
   $("#addSubscription").click(addSubscription);
   $("#acceptableAds").click(allowAcceptableAds);
   $("#whitelistForm").submit(addWhitelistDomain);
   $("#removeWhitelist").click(removeSelectedExcludedDomain);
@@ skipping 102 matching lines @@
   {
     var selectedIndex = 0;
     var selectedPrefix = null;
     var matchCount = 0;
 
     var list = document.getElementById("subscriptionSelector");
     var elements = request.responseXML.documentElement.getElementsByTagName("subscription");
     for (var i = 0; i < elements.length; i++)
     {
       var element = elements[i];
-      var option = document.createElement("option");
+      var option = new Option();
       option.text = element.getAttribute("title") + " (" + element.getAttribute("specialization") + ")";
       option._data = {
         title: element.getAttribute("title"),
         url: element.getAttribute("url"),
         homepage: element.getAttribute("homepage")
       };
 
       var prefix = require("utils").Utils.checkLocalePrefixMatch(element.getAttribute("prefixes"));
       if (prefix)
       {
@@ skipping 17 matching lines @@
           if (Math.random() * matchCount < 1)
           {
             selectedIndex = i;
             selectedPrefix = prefix;
           }
         }
       }
       list.appendChild(option);
     }
 
-    var option = document.createElement("option");
+    var option = new Option();
     option.text = i18n.getMessage("filters_addSubscriptionOther_label") + "\u2026";
     option._data = null;
     list.appendChild(option);
 
     list.selectedIndex = selectedIndex;
 
     if (delayedSubscriptionSelection)
       startSubscriptionSelection.apply(null, delayedSubscriptionSelection);
   };
   request.send(null);
@@ skipping 160 matching lines @@
     case "subscription.title":
     case "subscription.disabled":
     case "subscription.homepage":
     case "subscription.lastDownload":
     case "subscription.downloadStatus":
       var element = findSubscriptionElement(item);
       if (element)
         updateSubscriptionInfo(element);
       break;
     case "subscription.added":
-      if (!(item instanceof SpecialSubscription) && !findSubscriptionElement(item))
+      if (item instanceof SpecialSubscription)
       {
-        if (item.url == Prefs.subscriptions_exceptionsurl)
-          $("#acceptableAds").prop("checked", true);
-        else
-          addSubscriptionEntry(item);
+        for (var i = 0; i < item.filters.length; i++)
+          onFilterChange("filter.added", item.filters[i]);
       }
+      else if (item.url == Prefs.subscriptions_exceptionsurl)
+        $("#acceptableAds").prop("checked", true);
+      else if (!findSubscriptionElement(item))
+        addSubscriptionEntry(item);
       break;
     case "subscription.removed":
-      if (item.url == Prefs.subscriptions_exceptionsurl)
+      if (item instanceof SpecialSubscription)
+      {
+        for (var i = 0; i < item.filters.length; i++)
+          onFilterChange("filter.removed", item.filters[i]);
+      }
+      else if (item.url == Prefs.subscriptions_exceptionsurl)
         $("#acceptableAds").prop("checked", false);
       else
       {
         var element = findSubscriptionElement(item);
         if (element)
           element.parentNode.removeChild(element);
       }
       break;
     case "filter.added":
       if (item instanceof WhitelistFilter && /^@@\|\|([^\/:]+)\^\$document$/.test(item.text))
@@ skipping 13 matching lines @@
 // Populates a list box with a number of entries
 function populateList(id, entries)
 {
   var list = document.getElementById(id);
   while (list.lastChild)
     list.removeChild(list.lastChild);
 
   entries.sort();
   for (var i = 0; i < entries.length; i++)
   {
-    var option = document.createElement("option");
+    var option = new Option();
     option.text = entries[i];
     option.value = entries[i];
     list.appendChild(option);
   }
 }
 
 // Add a filter string to the list box.
 function appendToListBox(boxId, text)
 {
-  var elt = document.createElement("option");
+  var elt = new Option();  /* Note: document.createElement("option") is unreliable in Opera */
   elt.text = text;
   elt.value = text;
   document.getElementById(boxId).appendChild(elt);
 }
 
 // Remove a filter string from a list box.
 function removeFromListBox(boxId, text)
 {
-  var elt = document.createElement("option");
-  elt.text = text;
-  elt.value = text;
   var list = document.getElementById(boxId);
   for (var i = 0; i < list.length; i++)
     if (list.options[i].value == text)
       list.remove(i--);
 }
 
 function addWhitelistDomain(event)
 {
   event.preventDefault();
 
@@ skipping 142 matching lines @@
     if (subscription.disabled == !enabled.checked)
       return;
 
     subscription.disabled = !enabled.checked;
   }, false);
 
   updateSubscriptionInfo(element);
 
   document.getElementById("filterLists").appendChild(element);
 }