Applied changes from emailed code review

lib/typoFixer.js

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
 let {getSchemeCorrection, isKnownScheme, getDomainCorrection, getDomainReferral} = require("rules");
@@ skipping 125 matching lines @@
   }
   catch (e)
   {
     return (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS);
   }
 }
 
 function correctURL(window, value)
 {
   let hasCorrection = false;
-
-  // Trim it
+  
   value = value.trim();
   if (value.length == 0)
     return null;
 
   // Replace backslashes
   value = value.replace(/\\/g, "/");
 
   // Does the URL scheme need correcting?
   if (/^([^\/]+)(\/.*)/.test(value))
   {
@@ skipping 13 matching lines @@
 
   // Ignore search keywords and such
   if ("getShortcutOrURI" in window && window.getShortcutOrURI(value) != value)
     return null;
 
   // Spaces before the first slash or period is probably a quick search
   if (/^[^\/\.\s]+\s/.test(value))
     return null;
 
   // Check manually entered corrections
-  if (Prefs.custom_replace[value])
+  if (Prefs.custom_replace.hasOwnProperty(value) && Prefs.custom_replace[value])
     return Prefs.custom_replace[value];
-
+  
   let [prefix, domain, suffix] = parseURL(value);
   if (!domain)
     return null;
 
   let oldDomain = domain;
   if (!isIPAddress(domain))
   {
     processTypedDomain(domain);
 
     let newDomain = getDomainCorrection(domain);
@@ skipping 34 matching lines @@
   }
 
   if (!hasCorrection)
     return null;
 
   // Show infobar to inform and ask about correction
   let browser = appIntegration.getBrowser(window);
   let infobar = browser.getNotificationBox();
   let notif = infobar.getNotificationWithValue("url-fixer-infobar-askafter");
 
-  let [message, yes, no, cancel] = getAskAfterDialogTexts();
+  let [message, yes, no, cancel] = getInfobarTexts();
   message = message.replace(/\?1\?/g, prefix+domain);
 
   if (notif)
   {
     notif.label = message;
   }
   else
   {
     let buttons = [
       {
         label:      yes,
         accessKey:  null,
         callback:   function()
         {
           // Yes: Do nothing
         }
       },
       {
         label:      no,
         accessKey:  null,
         callback:   function()
         {
           // No: Add to list of corrections (ignore)
-          // TODO: maybe find more appropriate place to store this information
-          Prefs.custom_replace[value] = value;
-          Prefs.custom_replace = JSON.parse(JSON.stringify(Prefs.custom_replace));
+          if (/^www\./.test(value))
+          {
+            value = value.substr(4);
+          }

[Wladimir Palant, 2012/09/21 14:40:25]

Somebody reading this code now has to recognize that 4 is the length of the
string you looked for above; to verify correctness this somebody would have to
count the characters again and also check whether you made an off-by-one error
somewhere. This is bad for code maintainability.

How about value = value.replace(/^www\./, '') without any checks?

+          Prefs.whitelist[value] = value;
+          Prefs.whitelist = JSON.parse(JSON.stringify(Prefs.whitelist));

[Wladimir Palant, 2012/09/21 14:40:25]

I understand why you wanted the whitelist to be a hash but why store the key as
value as well? Why not just assign true as the value?

 
           browser.loadURI(value);
           processFalsePositive(oldDomain, domain);
         }
       }
     ];
     notif = infobar.appendNotification(
       message,
       "url-fixer-infobar-askafter",
       require("info").addonRoot + "icon64.png",
-      infobar.PRIORITY_INFO_LOW,
+      infobar.PRIORITY_INFO_HIGH,
       buttons
     );
     notif.persistence = 1;
   }
 
-  require("survey").incrementCorrectionsCounter(window);
+  require("survey").incrementCorrectionsCounter();
 
   // Consider the correction a second typed domain
   if (!isIPAddress(domain))
     processTypedDomain(domain);
 
   return prefix + domain + suffix;
 }
 
 let stringBundle = null;
 
-function getAskAfterDialogTexts()
+function getInfobarTexts()
 {
+  // Randomize URI to work around bug 719376
   if (!stringBundle)
     stringBundle = Services.strings.createBundle("chrome://url-fixer/locale/locale.properties?" + Math.random());
   let result = [
     stringBundle.GetStringFromName("urlfixer.isItCorrect"),
     stringBundle.GetStringFromName("urlfixer.yes"),
     stringBundle.GetStringFromName("urlfixer.no"),
     stringBundle.GetStringFromName("urlfixer.cancel")
   ];
 
-  getAskAfterDialogTexts = function() result;
-  return getAskAfterDialogTexts();
+  getInfobarTexts = function() result;
+  return getInfobarTexts();
 }