[Pkg-javascript-commits] [dojo] 40/87: backported fix for #14540; fixes #14540; !strict

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.7.5
in repository dojo.

commit 7c22949e5307283705e4ec74c3f6ab3269661cc9
Author: Rawld Gill <rgill at altoviso.com>
Date:   Sat Apr 21 00:28:07 2012 +0000

    backported fix for #14540; fixes #14540; !strict
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.7/dojo@28399 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 dojo.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dojo.js b/dojo.js
index e157673..7bfe530 100644
--- a/dojo.js
+++ b/dojo.js
@@ -142,7 +142,9 @@
 		return now && has(name);
 	};
 
-	has.add("host-node", typeof process == "object" && /node(\.exe)?$/.test(process.execPath));
+	has.add("host-node", userConfig.has && "host-node" in userConfig.has ?
+		userConfig.has["host-node"] :
+		(typeof process == "object" && process.versions && process.versions.node && process.versions.v8));
 	if(has("host-node")){
 		// fixup the default config for node.js environment
 		require("./_base/configNode.js").config(defaultConfig);
@@ -150,7 +152,9 @@
 		defaultConfig.loaderPatch.nodeRequire = require;
 	}
 
-	has.add("host-rhino", typeof load == "function" && (typeof Packages == "function" || typeof Packages == "object"));
+	has.add("host-rhino", userConfig.has && "host-rhino" in userConfig.has ?
+		userConfig.has["host-rhino"] :
+		(typeof load == "function" && (typeof Packages == "function" || typeof Packages == "object")));
 	if(has("host-rhino")){
 		// owing to rhino's lame feature that hides the source of the script, give the user a way to specify the baseUrl...
 		for(var baseUrl = userConfig.baseUrl || ".", arg, rhinoArgs = this.arguments, i = 0; i < rhinoArgs.length;){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git