Slight improvements to URL Fixer code

chrome/content/options.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Prefs} = require("prefs");
 Prefs.addListener(onPrefChange);
@@ skipping 19 matching lines @@
 }
 
 function onPrefChange(name)
 {
   if (name == "custom_replace" || name == "whitelist")
     updateList();
 }
 
 function updateList()
 {
+  //
+  // Custom rules
+  //
+
   let ruleListElement = E("custom_corrections");
-  let whitelistElement = E("whitelist");
 
   // Remove existing list entries
   for (let i = ruleListElement.getRowCount() - 1; i >= 0; i--)
     ruleListElement.removeItemAt(i);
-  for (let i = whitelistElement.getRowCount() - 1; i >= 0; i--)
-    whitelistElement.removeItemAt(i);
 
   // Build a list of custom rules and sort it alphabetically
   let prefRulesList = Prefs.custom_replace;
-  let prefWhitelist = Prefs.whitelist;
   let ruleList = [];
-  let whitelist = [];
-  
+
   for (let searchString in prefRulesList)
   {
     ruleList.push([searchString, prefRulesList[searchString]]);
   }
-  for (let searchString in prefWhitelist)
-  {
-    whitelist.push(searchString);
-  }
 
   ruleList.sort(function(a, b)
   {
     if (a[0] < b[0])
       return -1;
     else if (a[0] > b[0])
       return 1;
     else
       return 0;
   });
-  whitelist.sort();
 
   // Add the rules to the list
   if (ruleList.length > 0)
   {
     for (let i = 0; i < ruleList.length; i++)
     {
       let [searchString, replacement] = ruleList[i];
 
       let option = document.createElement('listitem');
       option.setAttribute("value", searchString);
@@ skipping 11 matching lines @@
   }
   else
   {
     let option = document.createElement("listitem");
     option.setAttribute("class", "auto-entry");
     option.setAttribute("label", ruleListElement.getAttribute("_emptyLabel"));
 
     ruleListElement.appendChild(option);
   }
 
+  //
+  // Exception rules
+  //
+
+  let whitelistElement = E("whitelist");
+
+  // Remove existing list entries
+  for (let i = whitelistElement.getRowCount() - 1; i >= 0; i--)
+    whitelistElement.removeItemAt(i);
+
+  // Build a list of exceptions and sort it alphabetically
+  let whitelist = Object.keys(Prefs.whitelist);
+  whitelist.sort();
+
+  // Add the rules to the list
   if (whitelist.length > 0)
   {
     for (let i = 0; i < whitelist.length; i++)
     {
       let option = document.createElement("listitem");
       option.setAttribute("value", whitelist[i]);
-      option.setAttribute("label", whitelist[i])
+      option.setAttribute("label", whitelist[i]);
 
       whitelistElement.appendChild(option);
     }
   }
   else
   {
     let option = document.createElement("listitem");
     option.setAttribute("class", "auto-entry");
     option.setAttribute("label", whitelistElement.getAttribute("_emptyLabel"));
 
@@ skipping 25 matching lines @@
   for (let i = items.length - 1; i >= 0; i--)
   {
     let searchString = items[i].getAttribute("value");
     delete Prefs[pref][searchString];
 
     if (pref == "whitelist")
       onWhitelistEntryRemoved(searchString);
   }
   Prefs[pref] = JSON.parse(JSON.stringify(Prefs[pref]));
 }