Defer scriptEval test until first use to prevent Content Security Policy inline-scrip...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 25ef22d..4311e31 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -63,6 +63,9 @@ var jQuery = function( selector, context ) {
        // The deferred used on DOM ready
        readyList,
 
+       // Promise methods
+       promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
+
        // The ready event handler
        DOMContentLoaded,
 
@@ -580,7 +583,7 @@ jQuery.extend({
 
                        script.type = "text/javascript";
 
-                       if ( jQuery.support.scriptEval ) {
+                       if ( jQuery.support.scriptEval() ) {
                                script.appendChild( document.createTextNode( data ) );
                        } else {
                                script.text = data;
@@ -914,16 +917,18 @@ jQuery.extend({
                        isRejected: failDeferred.isResolved,
                        // Get a promise for this deferred
                        // If obj is provided, the promise aspect is added to the object
-                       promise: function( obj ) {
+                       // (i is used internally)
+                       promise: function( obj , i ) {
                                if ( obj == null ) {
                                        if ( promise ) {
                                                return promise;
                                        }
                                        promise = obj = {};
                                }
-                               jQuery.each( "then done fail isResolved isRejected promise".split( " " ) , function( _ , method ) {
-                                       obj[ method ] = deferred[ method ];
-                               });
+                               i = promiseMethods.length;
+                               while( i-- ) {
+                                       obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ];
+                               }
                                return obj;
                        }