Changeset 2428

Timestamp:

07/20/07 21:59:52 (1 year ago)

Author:

jeresig

Message:

Completely reworked the evalScripts() code, fixing bugs #1332, #975, and #777.

Location:

trunk/jquery/src

Files:

• ajax/ajax.js (modified) (5 diffs)
• jquery/jquery.js (modified) (1 diff)

trunk/jquery/src/ajax/ajax.js

@@ -76 +76 @@
             ifModified: ifModified,
             complete: function(res, status){
+                // If successful, inject the HTML into all the matched elements
                 if ( status == "success" || !ifModified && status == "notmodified" )
-                    // Inject the HTML into all the matched elements
-                    self.attr("innerHTML", res.responseText)
-                      // Execute all the scripts inside of the newly-injected HTML
-                      .evalScripts()
-                      // Execute callback
-                      .each( callback, [res.responseText, status, res] );
-                else
-                    callback.apply( self, [res.responseText, status, res] );
+                    self.html(res.responseText)
+
+                self.each( callback, [res.responseText, status, res] );
             }
         });
@@ -111 +107 @@
     serialize: function() {
         return jQuery.param( this );
-    },
-
-    /**
-     * Evaluate all script tags inside this jQuery. If they have a src attribute,
-     * the script is loaded, otherwise it's content is evaluated.
-     *
-     * @name evalScripts
-     * @type jQuery
-     * @private
-     * @cat Ajax
-     */
-    evalScripts: function() {
-        return this.find("script").each(function(){
-            if ( this.src )
-                jQuery.getScript( this.src );
-            else
-                jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-        }).end();
     }
 
@@ -657 +635 @@
                 try {
                     status = isTimeout == "timeout" && "timeout" ||
-                                    !jQuery.httpSuccess( xml ) && "error" ||
-                                    s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
-                                    "success";
+                        !jQuery.httpSuccess( xml ) && "error" ||
+                        s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
+                        "success";
+
                     // Make sure that the request was successful or notmodified
                     if ( status != "error" && status != "timeout" ) {
@@ -784 +763 @@
         // If the type is "script", eval it in global context
         if ( type == "script" )
-            jQuery.globalEval( data );
+            (new Function( data ))();
 
         // Get the JavaScript object, if JSON is used.
         if ( type == "json" )
             data = eval("(" + data + ")");
-
-        // evaluate scripts within html
-        if ( type == "html" )
-            jQuery("<div>").html(data).evalScripts();
 
         return data;
@@ -824 +799 @@
         // Return the resulting serialization
         return s.join("&");
-    },
-    
-    // evalulates a script in global context
-    // not reliable for safari
-    globalEval: function( data ) {
-        data = jQuery.trim( data );
-        if ( data ) {
-            if ( window.execScript )
-                window.execScript( data );
-            else if ( jQuery.browser.safari )
-                // safari doesn't provide a synchronous global eval
-                window.setTimeout( data, 0 );
-            else
-                eval.call( window, data );
-        }
     }
 

trunk/jquery/src/jquery/jquery.js

@@ -1172 +1172 @@
 
             jQuery.each( a, function(){
-                fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+                if ( jQuery.nodeName(this, "script") ) {
+                    if ( this.src )
+                        jQuery.ajax({ url: this.src, async: false, dataType: "script" });
+                    else
+                        (new Function( this.text || this.textContent || this.innerHTML || "" ))();
+                } else
+                    fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
             });
-
         });
     }