Fix the approach used in ieFirstRun.js

html/static/js/ieFirstRun.js

-var AdblockPlus = {
-    require: function(param)
+var AdblockPlus = (function()
+{
+  var scopes =
+  {
+    prefs:
     {
-        if (param == "prefs")
+      Prefs: {documentation_link: ""}
+    },
+    utils:
+    {
+      Utils: {appLocale: ""}
+    },
+    filterClasses:
+    {
+      Filter:
+      {
+        fromText:
         {
-            return {
-                Prefs: 
-                {
-                    documentation_link: ""
-                }
-            }
-        }
-        if (param == "utils")
-        {
-            return {
-                Utils: 
-                {
-                    appLocale: ""
-                }
-            }
-        }
-        if (param == "filterClasses")
-        {
-            return {
-                Filter: 
-                {
-                    fromText: function(param) 
-                    { 
-                        return {
-                            matches: function(param) {
-                                return true; 
-                            } 
-                        }
-                    } 
-                }
-            }
-        }
-        return {};
+          matches: function(param) {return true}
+          }

[Felix Dahlke, 2014/07/16 11:05:17]

Indentation is still off here :P

+      }
     }
-}
+  };
 
-function initWrappers()
-{
-    AdblockPlus.getMessage = function(section, param)
+  var result = 
+  {
+    require: function(module)
     {
-        return window.Settings.GetMessage(section, param);
+      return scopes[module];
     }
-    Prefs.documentation_link = window.Settings.GetDocumentationLink();
-    Utils.appLocale = window.Settings.GetAppLocale();
-}
+  };
+
+  window.addEventListener("load", function()
+  {
+    result.getMessage = function(section, param) 

[Felix Dahlke, 2014/07/16 11:05:17]

Simpler:

result.getMessage = Settings.GetMessage;

[Oleksandr, 2014/07/16 11:19:41]

This doesn't work. Settings.GetMessage is a method in our injected object.

On 2014/07/16 11:05:17, Felix H. Dahlke wrote:

[Felix Dahlke, 2014/07/18 12:43:36]

Oh :P

+    {
+      return Settings.GetMessage(section, param);
+    }
+    scopes.prefs.Prefs.documentation_link = Settings.GetDocumentationLink();
+    scopes.utils.Utils.appLocale = Settings.GetAppLocale();
+  }, false);
+
+  return result;
+})();