1 files changed, 45 insertions, 50 deletions
diff --git a/js/src/Ice/ConnectionRequestHandler.js b/js/src/Ice/ConnectionRequestHandler.js
index f25b601829a..6c09d8c3463 100644
--- a/js/src/Ice/ConnectionRequestHandler.js
+++ b/js/src/Ice/ConnectionRequestHandler.js
@@ -7,54 +7,49 @@
 //
 // **********************************************************************
 
-(function(global){
-    require("Ice/Promise");
-    require("Ice/Class");
-    require("Ice/ReferenceMode");
-    
-    var Ice = global.Ice || {};
-    
-    var Promise = Ice.Promise;
-    var ReferenceMode = Ice.ReferenceMode;
+var Ice = require("../Ice/ModuleRegistry").Ice;
+Ice.__M.require(module, "Ice", ["../Ice/Promise", "../Ice/Class", "../Ice/ReferenceMode"]);
 
-    var ConnectionRequestHandler = Ice.Class({
-        __init__: function(ref, connection, compress)
-        {
-            this._reference = ref;
-            this._response = ref.getMode() == ReferenceMode.ModeTwoway;
-            this._connection = connection;
-            this._compress = compress;
-        },
-        prepareBatchRequest: function(out)
-        {
-            this._connection.prepareBatchRequest(out);
-        },
-        finishBatchRequest: function(out)
-        {
-            this._connection.finishBatchRequest(out, this._compress);
-        },
-        abortBatchRequest: function()
-        {
-            this._connection.abortBatchRequest();
-        },
-        sendAsyncRequest: function(out)
-        {
-            return out.__send(this._connection, this._compress, this._response);
-        },
-        asyncRequestTimedOut: function(out)
-        {
-            return this._connection.asyncRequestTimedOut(out);
-        },
-        getReference: function()
-        {
-            return this._reference;
-        },
-        getConnection: function()
-        {
-            return this._connection;
-        },
-    });
-    
-    Ice.ConnectionRequestHandler = ConnectionRequestHandler;
-    global.Ice = Ice;
-}(typeof (global) === "undefined" ? window : global));
+var Promise = Ice.Promise;
+var ReferenceMode = Ice.ReferenceMode;
+
+var ConnectionRequestHandler = Ice.Class({
+    __init__: function(ref, connection, compress)
+    {
+        this._reference = ref;
+        this._response = ref.getMode() == ReferenceMode.ModeTwoway;
+        this._connection = connection;
+        this._compress = compress;
+    },
+    prepareBatchRequest: function(out)
+    {
+        this._connection.prepareBatchRequest(out);
+    },
+    finishBatchRequest: function(out)
+    {
+        this._connection.finishBatchRequest(out, this._compress);
+    },
+    abortBatchRequest: function()
+    {
+        this._connection.abortBatchRequest();
+    },
+    sendAsyncRequest: function(out)
+    {
+        return out.__send(this._connection, this._compress, this._response);
+    },
+    asyncRequestTimedOut: function(out)
+    {
+        return this._connection.asyncRequestTimedOut(out);
+    },
+    getReference: function()
+    {
+        return this._reference;
+    },
+    getConnection: function()
+    {
+        return this._connection;
+    },
+});
+
+Ice.ConnectionRequestHandler = ConnectionRequestHandler;
+module.exports.Ice = Ice;