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 30 matching lines @@
 
         suffix += anchor;
       }
     }
   }
 
   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] = getInfobarTexts();

[Wladimir Palant, 2012/09/28 09:29:34]

You don't use a Cancel button - please remove the variable and the corresponding
strings.

+  message = message.replace(/\?1\?/g, prefix+domain);
+  let buttons = [
+    {
+      label:      yes,
+      accessKey:  null,
+      callback:   function()
+      {
+        // Yes: Do nothing
+      }
+    },
+    {
+      label:      no,
+      accessKey:  null,
+      callback:   function()
+      {
+        // No: Add to list of corrections (ignore)
+        if (/^www\./.test(value))
+        {
+          value = value.substr(4);
+        }
+        Prefs.whitelist[value] = value;

[Wladimir Palant, 2012/09/28 09:29:34]

Comments from previous review not addressed here - one of my changes replaced
the code here however.

+        Prefs.whitelist = JSON.parse(JSON.stringify(Prefs.whitelist));
 
-  let [message, yes, no, cancel] = getAskAfterDialogTexts();
-  message = message.replace(/\?1\?/g, prefix+domain);
+        require("appIntegration").loadURI(value);
+        processFalsePositive(oldDomain, domain);
+      }
+    }
+  ];
+  require("appIntegration").openInfobar(window, "url-fixer-infobar-askafter", message, buttons, 1);

[Wladimir Palant, 2012/09/28 09:29:34]

It isn't obvious why we pass 1 for persistence here, I had to look it up myself.
Reason is that we are about to load a different page which will change location
- so the message needs to survive one location change. Maybe add a comment
explaining that?

 
-  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));
-
-          browser.loadURI(value);
-          processFalsePositive(oldDomain, domain);
-        }
-      }
-    ];
-    notif = infobar.appendNotification(
-      message,
-      "url-fixer-infobar-askafter",
-      require("info").addonRoot + "icon64.png",
-      infobar.PRIORITY_INFO_LOW,
-      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();
 }