Loader build files for only setting global if its not explicitly set.

modified: ../build/yui-base/yui-base-coverage.js modified: ../build/yui-base/yui-base-debug.js modified: ../build/yui-base/yui-base-min.js modified: ../build/yui-base/yui-base.js modified: ../build/yui-core/yui-core-coverage.js modified: ../build/yui-core/yui-core-debug.js modified: ../build/yui-core/yui-core-min.js modified: ../build/yui-core/yui-core.js modified: ../build/yui-nodejs/yui-nodejs-coverage.js modified: ../build/yui-nodejs/yui-nodejs-debug.js modified: ../build/yui-nodejs/yui-nodejs-min.js modified: ../build/yui-nodejs/yui-nodejs.js modified: ../build/yui/yui-coverage.js modified: ../build/yui/yui-debug.js modified: ../build/yui/yui-min.js modified: ../build/yui/yui.js
yui · Sep 25, 2014 · 4281409 · 4281409
1 parent 518b9d1
commit 4281409
Show file tree

Hide file tree

Showing 16 changed files with 226 additions and 66 deletions.
diff --git a/build/yui-base/yui-base-coverage.js b/build/yui-base/yui-base-coverage.js
diff --git a/build/yui-base/yui-base-debug.js b/build/yui-base/yui-base-debug.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.

diff --git a/build/yui-base/yui-base-min.js b/build/yui-base/yui-base-min.js
diff --git a/build/yui-base/yui-base.js b/build/yui-base/yui-base.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.

diff --git a/build/yui-core/yui-core-coverage.js b/build/yui-core/yui-core-coverage.js
diff --git a/build/yui-core/yui-core-debug.js b/build/yui-core/yui-core-debug.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.

diff --git a/build/yui-core/yui-core-min.js b/build/yui-core/yui-core-min.js
diff --git a/build/yui-core/yui-core.js b/build/yui-core/yui-core.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.

diff --git a/build/yui-nodejs/yui-nodejs-coverage.js b/build/yui-nodejs/yui-nodejs-coverage.js
diff --git a/build/yui-nodejs/yui-nodejs-debug.js b/build/yui-nodejs/yui-nodejs-debug.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.

diff --git a/build/yui-nodejs/yui-nodejs-min.js b/build/yui-nodejs/yui-nodejs-min.js
diff --git a/build/yui-nodejs/yui-nodejs.js b/build/yui-nodejs/yui-nodejs.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.

diff --git a/build/yui/yui-coverage.js b/build/yui/yui-coverage.js
diff --git a/build/yui/yui-debug.js b/build/yui/yui-debug.js
@@ -132,6 +132,7 @@ available.
 
             // bind the specified additional modules for this instance
             if (!l) {
+                Y._afterConfig();
                 Y._setup();
             }
         }
@@ -145,6 +146,7 @@ available.
                 Y.applyConfig(args[i]);
             }
 
+            Y._afterConfig();
             Y._setup();
         }
 
@@ -476,8 +478,7 @@ proto = {
             throwFail: true,
             useBrowserConsole: true,
             useNativeES5: true,
-            win: win,
-            global: Function('return this')()
+            win: win
         };
 
         //Register the CSS stamp element
@@ -506,6 +507,25 @@ proto = {
 
     },
 
+    /**
+    This method is called after all other configuration has been applied to
+    the YUI instance.
+
+    @method _afterConfig
+    @private
+    **/
+    _afterConfig: function () {
+        var Y = this;
+
+        // We need to set up Y.config.global after the rest of the configuration
+        // so that setting it in user configuration prevents the library from
+        // using eval(). This is critical for Content Security Policy enabled
+        // sites and other environments like Chrome extensions
+        if (!Y.config.hasOwnProperty('global')) {
+            Y.config.global = Function('return this')();
+        }
+    },
+
     /**
     Finishes the instance setup. Attaches whatever YUI modules were defined
     at the time that this instance was created.