1 files changed, 16 insertions, 26 deletions

diff --git a/js/src/Ice/HashUtil.js b/js/src/Ice/HashUtil.js
index 7fe2f3f0c8a..ec04f37343d 100644
--- a/js/src/Ice/HashUtil.js
+++ b/js/src/Ice/HashUtil.js
@@ -7,44 +7,36 @@
 //
 // **********************************************************************
 
-(function(global){
-    require("Ice/StringUtil");
-    
-    var Ice = global.Ice || {};
-    
-    var StringUtil = Ice.StringUtil;
+var Ice = require("../Ice/StringUtil").Ice;
+var StringUtil = Ice.StringUtil;
 
-    var HashUtil = {};
-
-    HashUtil.addBoolean = function(h, b)
+Ice.HashUtil =
+{
+    addBoolean: function(h, b)
     {
         return ((h << 5) + h) ^ (b ? 0 : 1);
-    };
-
-    HashUtil.addString = function(h, str)
+    },
+    addString: function(h, str)
     {
         if(str !== undefined && str !== null)
         {
             h = ((h << 5) + h) ^ StringUtil.hashCode(str);
         }
         return h;
-    };
-
-    HashUtil.addNumber = function(h, num)
+    },
+    addNumber: function(h, num)
     {
         return ((h << 5) + h) ^ num;
-    };
-
-    HashUtil.addHashable = function(h, obj)
+    },
+    addHashable: function(h, obj)
     {
         if(obj !== undefined && obj !== null)
         {
             h = ((h << 5) + h) ^ obj.hashCode();
         }
         return h;
-    };
-    
-    HashUtil.addArray = function(h, arr, hashCode)
+    },
+    addArray: function(h, arr, hashCode)
     {
         if(arr !== undefined && arr !== null)
         {
@@ -54,8 +46,6 @@
             }
         }
         return h;
-    };
-
-    Ice.HashUtil = HashUtil;
-    global.Ice = Ice;
-}(typeof (global) === "undefined" ? window : global));
+    }
+};
+module.exports.Ice = Ice;