1 files changed, 79 insertions, 79 deletions
diff --git a/js/src/Ice/Initialize.js b/js/src/Ice/Initialize.js
index e1dd0c4a2b1..df48e4665a2 100644
--- a/js/src/Ice/Initialize.js
+++ b/js/src/Ice/Initialize.js
@@ -7,98 +7,98 @@
 //
 // **********************************************************************
 
-(function(global){
-    require("Ice/Protocol");
-    require("Ice/LocalException");
-    require("Ice/Communicator");
-    require("Ice/Properties");
+var Ice = require("../Ice/ModuleRegistry").Ice;
+Ice.__M.require(module, "Ice", 
+    [
+        "../Ice/Protocol", 
+        "../Ice/LocalException", 
+        "../Ice/Communicator", 
+        "../Ice/Properties"
+    ]);
 
-    var Ice = global.Ice || {};
-    var Protocol = Ice.Protocol;
-        
-    //
-    // Ice.InitializationData
-    //
-    Ice.InitializationData = function()
-    {
-        this.properties = null;
-        this.logger = null;
-    };
+var Protocol = Ice.Protocol;
+    
+//
+// Ice.InitializationData
+//
+Ice.InitializationData = function()
+{
+    this.properties = null;
+    this.logger = null;
+};
 
-    Ice.InitializationData.prototype.clone = function()
-    {
-        var r = new Ice.InitializationData();
-        r.properties = this.properties;
-        r.logger = this.logger;
-        return r;
-    };
+Ice.InitializationData.prototype.clone = function()
+{
+    var r = new Ice.InitializationData();
+    r.properties = this.properties;
+    r.logger = this.logger;
+    return r;
+};
+
+//
+// Ice.initialize()
+//
+Ice.initialize = function(arg1, arg2)
+{
+    var args = null;
+    var initData = null;
 
-    //
-    // Ice.initialize()
-    //
-    Ice.initialize = function(arg1, arg2)
+    if(arg1 instanceof Array)
     {
-        var args = null;
-        var initData = null;
+        args = arg1;
+    }
+    else if(arg1 instanceof Ice.InitializationData)
+    {
+        initData = arg1;
+    }
+    else if(arg1 !== undefined && arg1 !== null)
+    {
+        throw new Ice.InitializationException("invalid argument to initialize");
+    }
 
-        if(arg1 instanceof Array)
-        {
-            args = arg1;
-        }
-        else if(arg1 instanceof Ice.InitializationData)
+    if(arg2 !== undefined && arg2 !== null)
+    {
+        if(arg2 instanceof Ice.InitializationData && initData === null)
         {
-            initData = arg1;
+            initData = arg2;
         }
-        else if(arg1 !== undefined && arg1 !== null)
+        else
         {
             throw new Ice.InitializationException("invalid argument to initialize");
         }
+    }
 
-        if(arg2 !== undefined && arg2 !== null)
-        {
-            if(arg2 instanceof Ice.InitializationData && initData === null)
-            {
-                initData = arg2;
-            }
-            else
-            {
-                throw new Ice.InitializationException("invalid argument to initialize");
-            }
-
-        }
+    if(initData === null)
+    {
+        initData = new Ice.InitializationData();
+    }
+    else
+    {
+        initData = initData.clone();
+    }
+    initData.properties = Ice.createProperties(args, initData.properties);
 
-        if(initData === null)
-        {
-            initData = new Ice.InitializationData();
-        }
-        else
-        {
-            initData = initData.clone();
-        }
-        initData.properties = Ice.createProperties(args, initData.properties);
+    var result = new Ice.Communicator(initData);
+    result.finishSetup(null);
+    return result;
+};
 
-        var result = new Ice.Communicator(initData);
-        result.finishSetup(null);
-        return result;
-    };
+//
+// Ice.createProperties()
+//
+Ice.createProperties = function(args, defaults)
+{
+    return new Ice.Properties(args, defaults);
+};
 
-    //
-    // Ice.createProperties()
-    //
-    Ice.createProperties = function(args, defaults)
-    {
-        return new Ice.Properties(args, defaults);
-    };
+Ice.currentProtocol = function()
+{
+    return Protocol.currentProtocol.clone();
+};
 
-    Ice.currentProtocol = function()
-    {
-        return Protocol.currentProtocol.clone();
-    };
+Ice.currentEncoding = function()
+{
+    return Protocol.currentEncoding.clone();
+};
 
-    Ice.currentEncoding = function()
-    {
-        return Protocol.currentEncoding.clone();
-    };
-    
-    global.Ice = Ice;
-}(typeof (global) === "undefined" ? window : global));
+module.exports.Ice = Ice;