Issue 370 - Right-clicked element is removed independent of created filter

options.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var require = ext.backgroundPage.getWindow().require;
+var backgroundPage = ext.backgroundPage.getWindow();
+var require = backgroundPage.require;
 
 with(require("filterClasses"))
 {
   this.Filter = Filter;
   this.WhitelistFilter = WhitelistFilter;
 }
 with(require("subscriptionClasses"))
 {
   this.Subscription = Subscription;
   this.SpecialSubscription = SpecialSubscription;
@@ skipping 85 matching lines @@
       hasAcceptable = true;
       continue;
     }
 
     addSubscriptionEntry(subscription);
   }
 
   $("#acceptableAds").prop("checked", hasAcceptable);
 
   // User-entered filters
-  showUserFilters();
+  var userFilters = backgroundPage.getUserFilters();
+  populateList("userFiltersBox", userFilters.filters);
+  populateList("excludedDomainsBox", userFilters.exceptions);
 }
 
 // Cleans up when the options window is closed
 function unloadOptions()
 {
   FilterNotifier.removeListener(onFilterChange);
 }
 
 function initCheckbox(id)
 {
   var checkbox = document.getElementById(id);
-  checkbox.checked = typeof localStorage[id] == "undefined" ? true : localStorage[id] == "true";
+  checkbox.checked = Prefs[id];
   checkbox.addEventListener("click", function()
   {
-    localStorage[id] = checkbox.checked;
+    Prefs[id] = checkbox.checked;
   }, false);
 }
 
-function showUserFilters()
-{
-  var filters = [];
-  var exceptions = [];
-  for (var i = 0; i < FilterStorage.subscriptions.length; i++)
-  {
-    var subscription = FilterStorage.subscriptions[i];
-    if (!(subscription instanceof SpecialSubscription))
-      continue;
-
-    for (var j = 0; j < subscription.filters.length; j++)
-    {
-      var filter = subscription.filters[j];
-      if (filter instanceof WhitelistFilter && /^@@\|\|([^\/:]+)\^\$document$/.test(filter.text))
-        exceptions.push(RegExp.$1)
-      else
-        filters.push(filter.text);
-    }
-  }
-
-  populateList("userFiltersBox", filters);
-  populateList("excludedDomainsBox", exceptions);
-}
-
 var delayedSubscriptionSelection = null;
 
 function loadRecommendations()
 {
   var request = new XMLHttpRequest();
   request.open("GET", "subscriptions.xml");
   request.onload = function()
   {
     var selectedIndex = 0;
     var selectedPrefix = null;
@@ skipping 469 matching lines @@
       links[i].href = arguments[i + 1];
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof arguments[i + 1] == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", arguments[i + 1], false);
     }
   }
 }