Skip to content
Permalink
Browse files

Completely reworked the evalScripts() code, fixing bugs #1332, #975, …

…and #777.
  • Loading branch information
jeresig committed Jul 20, 2007
1 parent 6c5bfff commit c47f6f8f523c8add478fbf5570a67015426f5b86
Showing with 16 additions and 51 deletions.
  1. +9 −49 src/ajax/ajax.js
  2. +7 −2 src/jquery/jquery.js
@@ -75,15 +75,11 @@ jQuery.fn.extend({
data: params,
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] );
}
});
return this;
@@ -110,24 +106,6 @@ jQuery.fn.extend({
*/
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();
}

});
@@ -656,9 +634,10 @@ jQuery.extend({
var status;
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" ) {
// Cache Last-Modified header, if ifModified mode.
@@ -783,16 +762,12 @@ jQuery.extend({

// 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;
},

@@ -823,21 +798,6 @@ jQuery.extend({

// 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 );
}
}

});
@@ -1171,9 +1171,14 @@ jQuery.fn = jQuery.prototype = {
obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));

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 ] );
});

});
}
};

0 comments on commit c47f6f8

Please sign in to comment.
You can’t perform that action at this time.