From fef794cdd1f8eb698fa3ccfe6f4cacba88030e9d Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 2 Sep 2014 14:22:34 +0200 Subject: Fixed (ICE-5654) - Update JS mapping to not use global types in NodeJS --- js/test/Ice/inheritance/Client.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'js/test/Ice/inheritance/Client.js') diff --git a/js/test/Ice/inheritance/Client.js b/js/test/Ice/inheritance/Client.js index 0e8de3ce6fb..fa73d971feb 100644 --- a/js/test/Ice/inheritance/Client.js +++ b/js/test/Ice/inheritance/Client.js @@ -7,13 +7,11 @@ // // ********************************************************************** -(function(global){ - var require = typeof(module) !== "undefined" ? module.require : function(){}; - require("Ice/Ice"); - var Ice = global.Ice; +(function(module, require, exports) +{ + var Ice = require("icejs").Ice; + var Test = require("Test").Test; - require("Test"); - var Test = global.Test; var Promise = Ice.Promise; var allTests = function(out, communicator) @@ -295,7 +293,10 @@ }); }); }; - global.__test__ = run; - global.__clientAllTests__ = allTests; - global.__runServer__ = true; -}(typeof (global) === "undefined" ? window : global)); + exports.__test__ = run; + exports.__clientAllTests__ = allTests; + exports.__runServer__ = true; +} +(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : window.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : window)); -- cgit v1.2.3