Backport: Get rid of nested functions declarations that are not on top level (causes strict mode wa…

lib/typoAppIntegration.js

 /*
  * This file is part of the URL Fixer,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * URL Fixer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * URL Fixer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 18 matching lines @@
     functionHooks.delete(window);
   }
 };
 
 switch (addonName)
 {
   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)
     {
       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 = [
           {
@@ skipping 13 matching lines @@
             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);
       }
-      
+
       return Prefs.correctTypos;
     };
-    
+
     break;
   }
 }
 
 switch (application)
 {
   case "firefox":
   {
     // Firefox
     exports.isKnownWindow = function(window) window.document.documentElement.getAttribute("windowtype") == "navigator:browser";
@@ skipping 56 matching lines @@
 
     exports.getBrowser = function(window) "gBrowser" in window ? window.gBrowser : null;
 
     exports.applyToWindow = function(window, corrector)
     {
       let urlbar = exports.getURLBar(window);
       let goButton = window.document.getElementById("go-button-container");
 
       if (urlbar && urlbar._fireEvent && !functionHooks.has(window))
       {
-        function correctURL()
+        let correctURL = function()
         {
           let correction = corrector(window, urlbar.value);
           if (correction)
             urlbar.value = correction;
-        }
+        };
 
         let unhook = hook(urlbar, "_fireEvent", function(eventType)
         {
           if (eventType == "textentered")
           {
             correctURL();
           }
         });
         functionHooks.set(window, unhook);
 
@@ skipping 117 matching lines @@
 
     exports.getURLBar = function(window) null;
 
     exports.getBrowser = function(window) null;
 
     exports.applyToWindow = function(window, corrector)
     {
       if ("BrowserApp" in window && window.BrowserApp.observe && !functionHooks.has(window))
       {
         let innerUnhook = null;
-        function cleanup()
+        let cleanup = function()
         {
           if (innerUnhook)
             innerUnhook();
 
           innerUnhook = null;
-        }
+        };
 
         let unhook = hook(window.BrowserApp, "observe", function(subject, topic, data)
         {
           // Huge hack: we replace addTab/loadURI when the observer is
           // triggered. This seems to be the only way to know that the calls
           // originate from user input.
           let method = null;
           if (topic == "Tab:Add")
             method = "addTab";
           else if (topic == "Tab:Load")
@@ skipping 34 matching lines @@
     };
 
     break;
   }
   default:
   {
     exports.isKnownWindow = function(window) false;
     break;
   }
 }