Integrated URL Fixer into Adblock Plus

lib/typoAppIntegration.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/. */
 
 let {hook} = require("hooks");
 let {application, addonName} = require("info");
 
 let functionHooks = new WeakMap();
 
 exports.removeFromWindow = function(window)
@@ skipping 11 matching lines @@
   case "url-fixer":
   {
     // URL Fixer
     exports.isTypoCorrectionEnabled = function(window, prefix, domain, suffix) true;
     
     break;
   }
   case "adblockplus":
   {
     // Adblock Plus
+    let {Prefs} = require("prefs");
+    
+    // Do not ask to opt-in if user found setting
+    if (!Prefs.correctTyposAsked)
+    {
+      let onPrefChange = function(name)
+      {
+        if (name == "correctTypos")
+        {
+          Prefs.correctTyposAsked = true;
+          Prefs.removeListener(onPrefChange);
+        }
+      }
+      
+      Prefs.addListener(onPrefChange);
+    }
+    
     exports.isTypoCorrectionEnabled = function(window, prefix, domain, suffix)
     {
-      let {Prefs} = require("prefs");
-      
-      if (!Prefs.correctTyposAsk && !Prefs.correctTypos)
+      if (!Prefs.correctTyposAsked && !Prefs.correctTypos)
       {
         let {Utils} = require("utils");
         let message = Utils.getString("typo_optin_message").replace(/\?1\?/, domain);
         let yes = Utils.getString("typo_optin_yes");
         let no = Utils.getString("typo_optin_no");
         let buttons = [
           {
             label:      yes,
             accessKey:  null,
             callback:   function()
             {
               // Yes: Enable typo correction
               Prefs.correctTypos = true;
-              
               exports.loadURI(window, prefix + domain + suffix);
+              Prefs.correctTyposAsked = true;
             }
           },
           {
             label:      no,
             accessKey:  null,
             callback:   function()
             {
               // No: Do nothing
+              Prefs.correctTyposAsked = true;
             }
           }
         ];
         // We need to have persistence being set to 1 due to redirect which happens afterwards
         exports.openInfobar(window, "adblockplus-infobar-correct-typos-ask", message, buttons, 1);
-        
-        Prefs.correctTyposAsk = true;
-        
-        return false;
       }
       
       return Prefs.correctTypos;
     };
     
     break;
   }
 }
 
 switch (application)
@@ skipping 265 matching lines @@
     };
 
     break;
   }
   default:
   {
     exports.isKnownWindow = function(window) false;
     break;
   }
 }