refs #19049, avoid Rhino's global function

dojo · Sep 20, 2017 · 467bba4 · 467bba4
1 parent e653d77
commit 467bba4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dojo.js b/dojo.js
@@ -64,7 +64,7 @@
 
 	// define global
 	var globalObject = (function(){
-		if (typeof global !== 'undefined') {
+		if (typeof global !== 'undefined' && typeof global !== 'function') {
 			// global spec defines a reference to the global object called 'global'
 			// https://github.com/tc39/proposal-global
 			// `global` is also defined in NodeJS

diff --git a/global.js b/global.js
@@ -1,5 +1,5 @@
 define(function(){
-    if (typeof global !== 'undefined') {
+    if (typeof global !== 'undefined' && typeof global !== 'function') {
         // global spec defines a reference to the global object called 'global'
         // https://github.com/tc39/proposal-global
         // `global` is also defined in NodeJS