deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaned up some spacing and braces.

Browse source
This commit is contained in:
John Resig 2007-01-06 06:18:02 +00:00
parent c330527318
commit ab0287681f
1 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/ajax/ajax.js
View file

@ -53,7 +53,7 @@ jQuery.fn.extend({
var type = "GET";
// If the second parameter was provided
if ( params ) {
if ( params )
// If it's a function
if ( params.constructor == Function ) {
// We assume that it's the callback
@ -65,7 +65,6 @@ jQuery.fn.extend({
params = jQuery.param( params );
type = "POST";
}
}
var self = this;
@ -76,14 +75,14 @@ jQuery.fn.extend({
data: params,
ifModified: ifModified,
complete: function(res, status){
if ( status == "success" || !ifModified && status == "notmodified" ) {
if ( status == "success" || !ifModified && status == "notmodified" )
// Inject the HTML into all the matched elements
self.html(res.responseText)
// Execute all the scripts inside of the newly-injected HTML
.evalScripts()
// Execute callback
.each( callback, [res.responseText, status, res] );
} else
else
callback.apply( self, [res.responseText, status, res] );
}
});
@ -125,9 +124,8 @@ jQuery.fn.extend({
return this.find('script').each(function(){
if ( this.src )
jQuery.getScript( this.src );
else {
else
jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
}
}).end();
}
@ -279,6 +277,7 @@ jQuery.extend({
callback = data;
data = null;
}
return jQuery.ajax({
url: url,
data: data,
@ -630,6 +629,7 @@ jQuery.extend({
// Allow custom headers/mimetypes
if( s.beforeSend )
s.beforeSend(xml);
if ( s.global )
jQuery.event.trigger("ajaxSend", [xml, s]);
@ -663,9 +663,8 @@ jQuery.extend({
// Fire the global callback
if( s.global )
jQuery.event.trigger( "ajaxSuccess", [xml, s] );
} else {
} else
jQuery.handleError(s, xml, status);
}
} catch(e) {
status = "error";
jQuery.handleError(s, xml, status, e);
@ -680,7 +679,8 @@ jQuery.extend({
jQuery.event.trigger( "ajaxStop" );
// Process result
if ( s.complete ) s.complete(xml, status);
if ( s.complete )
s.complete(xml, status);
// Stop memory leaks
xml.onreadystatechange = function(){};
@ -766,15 +766,16 @@ jQuery.extend({
data = type == "xml" || data ? r.responseXML : r.responseText;
// If the type is "script", eval it in global context
if ( type == "script" ) {
if ( type == "script" )
jQuery.globalEval( data );
}
// Get the JavaScript object, if JSON is used.
if ( type == "json" ) eval( "data = " + data );
if ( type == "json" )
eval( "data = " + data );
// evaluate scripts within html
if ( type == "html" ) jQuery("<div>").html(data).evalScripts();
if ( type == "html" )
jQuery("<div>").html(data).evalScripts();
return data;
},
@ -786,25 +787,21 @@ jQuery.extend({
// If an array was passed in, assume that it is an array
// of form elements
if ( a.constructor == Array || a.jquery ) {
if ( a.constructor == Array || a.jquery )
// Serialize the form elements
for ( var i = 0; i < a.length; i++ )
s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) );
// Otherwise, assume that it's an object of key/value pairs
} else {
else
// Serialize the key/values
for ( var j in a ) {
for ( var j in a )
// If the value is an array then the key names need to be repeated
if( a[j].constructor == Array ) {
for (var k = 0; k < a[j].length; k++) {
if ( a[j].constructor == Array )
for ( var k = 0; k < a[j].length; k++ )
s.push( j + "=" + encodeURIComponent( a[j][k] ) );
}
} else {
else
s.push( j + "=" + encodeURIComponent( a[j] ) );
}
}
}
// Return the resulting serialization
return s.join("&");