1 files changed, 51 insertions, 57 deletions
diff --git a/js/src/Ice/RouterManager.js b/js/src/Ice/RouterManager.js
index 74156908bdd..7c05541c256 100644
--- a/js/src/Ice/RouterManager.js
+++ b/js/src/Ice/RouterManager.js
@@ -7,71 +7,65 @@
 //
 // **********************************************************************
 
-(function(global){
-    require("Ice/Class");
-    require("Ice/HashMap");
-    require("Ice/RouterInfo");
-    require("Ice/Router");
-    
-    var Ice = global.Ice || {};
-    
-    var HashMap = Ice.HashMap;
-    var RouterInfo = Ice.RouterInfo;
-    var RouterPrx = Ice.RouterPrx;
+var Ice = require("../Ice/ModuleRegistry").Ice;
+Ice.__M.require(module, "Ice", ["../Ice/Class", "../Ice/HashMap", "../Ice/RouterInfo", "../Ice/Router"]);
 
-    var RouterManager = Ice.Class({
-        __init__: function()
+var HashMap = Ice.HashMap;
+var RouterInfo = Ice.RouterInfo;
+var RouterPrx = Ice.RouterPrx;
+
+var RouterManager = Ice.Class({
+    __init__: function()
+    {
+        this._table = new HashMap(); // Map<Ice.RouterPrx, RouterInfo>
+        this._table.keyComparator = HashMap.compareEquals;
+    },
+    destroy: function()
+    {
+        for(var e = this._table.entries; e !== null; e = e.next)
         {
-            this._table = new HashMap(); // Map<Ice.RouterPrx, RouterInfo>
-            this._table.keyComparator = HashMap.compareEquals;
-        },
-        destroy: function()
+            e.value.destroy();
+        }
+        this._table.clear();
+    },
+    //
+    // Returns router info for a given router. Automatically creates
+    // the router info if it doesn't exist yet.
+    //
+    find: function(rtr)
+    {
+        if(rtr === null)
         {
-            for(var e = this._table.entries; e !== null; e = e.next)
-            {
-                e.value.destroy();
-            }
-            this._table.clear();
-        },
+            return null;
+        }
+
         //
-        // Returns router info for a given router. Automatically creates
-        // the router info if it doesn't exist yet.
+        // The router cannot be routed.
         //
-        find: function(rtr)
+        var router = RouterPrx.uncheckedCast(rtr.ice_router(null));
+
+        var info = this._table.get(router);
+        if(info === undefined)
         {
-            if(rtr === null)
-            {
-                return null;
-            }
+            info = new RouterInfo(router);
+            this._table.set(router, info);
+        }
 
-            //
+        return info;
+    },
+    erase: function(rtr)
+    {
+        var info = null;
+        if(rtr !== null)
+        {
             // The router cannot be routed.
-            //
             var router = RouterPrx.uncheckedCast(rtr.ice_router(null));
 
-            var info = this._table.get(router);
-            if(info === undefined)
-            {
-                info = new RouterInfo(router);
-                this._table.set(router, info);
-            }
-
-            return info;
-        },
-        erase: function(rtr)
-        {
-            var info = null;
-            if(rtr !== null)
-            {
-                // The router cannot be routed.
-                var router = RouterPrx.uncheckedCast(rtr.ice_router(null));
-
-                info = this._table.get(router);
-                this._table.delete(router);
-            }
-            return info;
+            info = this._table.get(router);
+            this._table.delete(router);
         }
-    });
-    Ice.RouterManager = RouterManager;
-    global.Ice = Ice;
-}(typeof (global) === "undefined" ? window : global));
+        return info;
+    }
+});
+Ice.RouterManager = RouterManager;
+module.exports.Ice = Ice;