Integrated URL Fixer into Adblock Plus

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, onWhitelistEntryAdded} = require("typoRules");
@@ skipping 124 matching lines @@
 
         suffix += anchor;
       }
     }
   }
 
   if (!hasCorrection)
     return null;
   
   if (!appIntegration.isTypoCorrectionEnabled(window, prefix, domain, suffix))
-    return;
+    return null;
 
   // Show infobar to inform and ask about correction
   let [message, yes, no] = getInfobarTexts();
   message = message.replace(/\?1\?/g, prefix+domain);
   let buttons = [
     {
       label:      yes,
       accessKey:  null,
       callback:   function()
       {
@@ skipping 10 matching lines @@
         Prefs.whitelist[entry] = true;
         onWhitelistEntryAdded(entry);
         Prefs.whitelist = JSON.parse(JSON.stringify(Prefs.whitelist));
 
         appIntegration.loadURI(window, value);
         processFalsePositive(domain, oldDomain);
       }
     }
   ];
   // We need to have persistence being set to 1 due to redirect which happens afterwards
-  appIntegration.openInfobar(window, "url-fixer-infobar-askafter", message, buttons, 1);
+  appIntegration.openInfobar(window, require("info").addonName + "-infobar-askafter", message, buttons, 1);
 
   require("typoSurvey").incrementCorrectionsCounter();
 
   return prefix + domain + suffix;
 }
 
 let stringBundle = null;
 
 function getInfobarTexts()
 {
   // Randomize URI to work around bug 719376
   if (!stringBundle)
     stringBundle = Services.strings.createBundle("chrome://" + require("info").addonName + "/locale/typo.properties?" + Math.random());
   let result = [
     stringBundle.GetStringFromName("urlfixer.isItCorrect"),
     stringBundle.GetStringFromName("urlfixer.yes"),
     stringBundle.GetStringFromName("urlfixer.no")
   ];
 
   getInfobarTexts = function() result;
   return getInfobarTexts();
 }