Integrated URL Fixer into Adblock Plus

lib/typoRules.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/FileUtils.jsm");
 
 let {Prefs} = require("prefs");
 
 let RULES_VERSION = 2;
@@ skipping 63 matching lines @@
   catch (e)
   {
     if (e.result != Cr.NS_ERROR_FILE_NOT_FOUND)
       Cu.reportError(e);
     callback(false);
   }
 }
 
 function getRuleFile()
 {
-  let result = FileUtils.getFile("ProfD", ["url-fixer-rules.json"]);

[Wladimir Palant, 2012/11/06 15:48:03]

The file name should depend on the extension - just in case URL Fixer and
Adblock Plus are installed in parallel. Maybe use require("info").addonName
somehow.

+  let result = FileUtils.getFile("ProfD", [require("info").addonName + "-rules.json"]);
 
   getRuleFile = function() result;
   return getRuleFile();
 }
 
 function addCustomRules()
 {
   for (let domain in Prefs.whitelist)
     onWhitelistEntryAdded(domain);
 }
@@ skipping 305 matching lines @@
       bestSuggestionDistance = distance;
       bestSuggestionMatched = matchedLen;
       bestSuggestionPriority = priority;
     }
   }
   if (bestSuggestion)
     return input.substr(0, input.length - bestSuggestionMatched) + bestSuggestion;
   else
     return input;
 }