issue 1526 - Implement new options page design for Chrome/Opera/Safari

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 "use strict";
 
 (function()
 {
   var subscriptionsMap = Object.create(null);
   var recommendationsMap = Object.create(null);
   var filtersMap = Object.create(null);
   var collections = Object.create(null);
 
   function Collection(details)
   {
     this.details = details;
-  }
-
-  Collection.prototype = Object.create(Array.prototype);
+    this.items = [];
+  }
+
   Collection.prototype.addItems = function() 
   {
-    var length = Array.prototype.push.apply(this, arguments);
+    var length = Array.prototype.push.apply(this.items, arguments);
     if (length == 0)
       return;
 
-    this.sort(function(a, b)
+    this.items.sort(function(a, b)
     {
       var aValue = (a.title || a.url || a.text).toLowerCase();
       var bValue = (b.title || b.url || a.text).toLowerCase();
       return aValue.localeCompare(bValue);
     });
 
     for (var j = 0; j < this.details.length; j++) 
     {
       var table = E(this.details[j].id);
       var template = table.querySelector("template");
       for (var i = 0; i < arguments.length; i++) 
       {
         var item = arguments[i];
         var text = item.title || item.url || item.text;
         var listItem = document.createElement("li");
         listItem.appendChild(document.importNode(template.content, true));
         listItem.dataset.access = item.url || item.text;
         listItem.querySelector(".display").textContent = text;
         if (text)
           listItem.dataset.search = text.toLowerCase();
 
         var control = listItem.querySelector(".control");
         if (control)
         {
           control.addEventListener("click", this.details[j].onClick, false);
           control.checked = item.disabled == false;
         }
 
         if (table.hasChildNodes())
-          table.insertBefore(listItem, table.childNodes[this.indexOf(item)]);
+          table.insertBefore(listItem, table.childNodes[this.items.indexOf(item)]);
         else
           table.appendChild(listItem);
       }
     }
     return length;
   };
 
   Collection.prototype.removeItem = function(item)
   {
-    var index = this.indexOf(item);
+    var index = this.items.indexOf(item);
     if (index == -1)
       return;
 
-    this.splice(index, 1);
+    this.items.splice(index, 1);
     var access = (item.url || item.text).replace(/'/g, "\\'");
     for (var i = 0; i < this.details.length; i++)
     {
       var table = E(this.details[i].id);
       var element = table.querySelector("[data-access='" + access + "']");
       element.parentElement.removeChild(element);
     }
   };
 
   Collection.prototype.clearAll = function()
   {
     for (var i = 0; i < this.details.length; i++)
     {
       var table = E(this.details[i].id);
       var template = table.querySelector("template");
       table.innerHTML = "";
       table.appendChild(template);
     }
-    this.length = 0;
+    this.items.length = 0;
   };
 
   function onToggleSubscriptionClick(e)
   {
     e.preventDefault();
     var subscriptionUrl = e.target.parentNode.dataset.access;
     if (!e.target.checked)
       removeSubscription(subscriptionUrl);
     else
       addEnableSubscription(subscriptionUrl);
@@ skipping 535 matching lines @@
     filter: ["added", "loaded", "removed"]
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "removed", "title"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();