Cleaned up some spacing and braces.

This commit is contained in:
John Resig 2007-01-06 06:18:02 +00:00
parent c330527318
commit ab0287681f

View File

@ -53,7 +53,7 @@ jQuery.fn.extend({
var type = "GET"; var type = "GET";
// If the second parameter was provided // If the second parameter was provided
if ( params ) { if ( params )
// If it's a function // If it's a function
if ( params.constructor == Function ) { if ( params.constructor == Function ) {
// We assume that it's the callback // We assume that it's the callback
@ -65,7 +65,6 @@ jQuery.fn.extend({
params = jQuery.param( params ); params = jQuery.param( params );
type = "POST"; type = "POST";
} }
}
var self = this; var self = this;
@ -76,14 +75,14 @@ jQuery.fn.extend({
data: params, data: params,
ifModified: ifModified, ifModified: ifModified,
complete: function(res, status){ complete: function(res, status){
if ( status == "success" || !ifModified && status == "notmodified" ) { if ( status == "success" || !ifModified && status == "notmodified" )
// Inject the HTML into all the matched elements // Inject the HTML into all the matched elements
self.html(res.responseText) self.html(res.responseText)
// Execute all the scripts inside of the newly-injected HTML // Execute all the scripts inside of the newly-injected HTML
.evalScripts() .evalScripts()
// Execute callback // Execute callback
.each( callback, [res.responseText, status, res] ); .each( callback, [res.responseText, status, res] );
} else else
callback.apply( self, [res.responseText, status, res] ); callback.apply( self, [res.responseText, status, res] );
} }
}); });
@ -125,9 +124,8 @@ jQuery.fn.extend({
return this.find('script').each(function(){ return this.find('script').each(function(){
if ( this.src ) if ( this.src )
jQuery.getScript( this.src ); jQuery.getScript( this.src );
else { else
jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" ); jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
}
}).end(); }).end();
} }
@ -279,6 +277,7 @@ jQuery.extend({
callback = data; callback = data;
data = null; data = null;
} }
return jQuery.ajax({ return jQuery.ajax({
url: url, url: url,
data: data, data: data,
@ -424,7 +423,7 @@ jQuery.extend({
* @param Number time How long before an AJAX request times out. * @param Number time How long before an AJAX request times out.
* @cat AJAX * @cat AJAX
*/ */
ajaxTimeout: function(timeout) { ajaxTimeout: function( timeout ) {
jQuery.ajaxSettings.timeout = timeout; jQuery.ajaxSettings.timeout = timeout;
}, },
@ -448,8 +447,8 @@ jQuery.extend({
* @param Map settings Key/value pairs to use for all AJAX requests * @param Map settings Key/value pairs to use for all AJAX requests
* @cat AJAX * @cat AJAX
*/ */
ajaxSetup: function(settings) { ajaxSetup: function( settings ) {
jQuery.extend(jQuery.ajaxSettings, settings); jQuery.extend( jQuery.ajaxSettings, settings );
}, },
ajaxSettings: { ajaxSettings: {
@ -630,7 +629,8 @@ jQuery.extend({
// Allow custom headers/mimetypes // Allow custom headers/mimetypes
if( s.beforeSend ) if( s.beforeSend )
s.beforeSend(xml); s.beforeSend(xml);
if (s.global)
if ( s.global )
jQuery.event.trigger("ajaxSend", [xml, s]); jQuery.event.trigger("ajaxSend", [xml, s]);
// Wait for a response to come back // Wait for a response to come back
@ -663,9 +663,8 @@ jQuery.extend({
// Fire the global callback // Fire the global callback
if( s.global ) if( s.global )
jQuery.event.trigger( "ajaxSuccess", [xml, s] ); jQuery.event.trigger( "ajaxSuccess", [xml, s] );
} else { } else
jQuery.handleError(s, xml, status); jQuery.handleError(s, xml, status);
}
} catch(e) { } catch(e) {
status = "error"; status = "error";
jQuery.handleError(s, xml, status, e); jQuery.handleError(s, xml, status, e);
@ -680,7 +679,8 @@ jQuery.extend({
jQuery.event.trigger( "ajaxStop" ); jQuery.event.trigger( "ajaxStop" );
// Process result // Process result
if ( s.complete ) s.complete(xml, status); if ( s.complete )
s.complete(xml, status);
// Stop memory leaks // Stop memory leaks
xml.onreadystatechange = function(){}; xml.onreadystatechange = function(){};
@ -690,10 +690,10 @@ jQuery.extend({
xml.onreadystatechange = onreadystatechange; xml.onreadystatechange = onreadystatechange;
// Timeout checker // Timeout checker
if(s.timeout > 0) if ( s.timeout > 0 )
setTimeout(function(){ setTimeout(function(){
// Check to see if the request is still happening // Check to see if the request is still happening
if(xml) { if ( xml ) {
// Cancel the request // Cancel the request
xml.abort(); xml.abort();
@ -713,19 +713,19 @@ jQuery.extend({
} }
// firefox 1.5 doesn't fire statechange for sync requests // firefox 1.5 doesn't fire statechange for sync requests
if(!s.async) if ( !s.async )
onreadystatechange(); onreadystatechange();
// return XMLHttpRequest to allow aborting the request etc. // return XMLHttpRequest to allow aborting the request etc.
return xml2; return xml2;
}, },
handleError: function(s, xml, status, e) { handleError: function( s, xml, status, e ) {
// If a local callback was specified, fire it // If a local callback was specified, fire it
if ( s.error ) s.error( xml, status, e ); if ( s.error ) s.error( xml, status, e );
// Fire the global callback // Fire the global callback
if( s.global ) if ( s.global )
jQuery.event.trigger( "ajaxError", [xml, s, e] ); jQuery.event.trigger( "ajaxError", [xml, s, e] );
}, },
@ -733,7 +733,7 @@ jQuery.extend({
active: 0, active: 0,
// Determines if an XMLHttpRequest was successful or not // Determines if an XMLHttpRequest was successful or not
httpSuccess: function(r) { httpSuccess: function( r ) {
try { try {
return !r.status && location.protocol == "file:" || return !r.status && location.protocol == "file:" ||
( r.status >= 200 && r.status < 300 ) || r.status == 304 || ( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
@ -743,7 +743,7 @@ jQuery.extend({
}, },
// Determines if an XMLHttpRequest returns NotModified // Determines if an XMLHttpRequest returns NotModified
httpNotModified: function(xml, url) { httpNotModified: function( xml, url ) {
try { try {
var xmlRes = xml.getResponseHeader("Last-Modified"); var xmlRes = xml.getResponseHeader("Last-Modified");
@ -760,51 +760,48 @@ jQuery.extend({
* (String) data - The type of data that you're expecting back, * (String) data - The type of data that you're expecting back,
* (e.g. "xml", "html", "script") * (e.g. "xml", "html", "script")
*/ */
httpData: function(r,type) { httpData: function( r, type ) {
var ct = r.getResponseHeader("content-type"); var ct = r.getResponseHeader("content-type");
var data = !type && ct && ct.indexOf("xml") >= 0; var data = !type && ct && ct.indexOf("xml") >= 0;
data = type == "xml" || data ? r.responseXML : r.responseText; data = type == "xml" || data ? r.responseXML : r.responseText;
// If the type is "script", eval it in global context // If the type is "script", eval it in global context
if ( type == "script" ) { if ( type == "script" )
jQuery.globalEval( data ); jQuery.globalEval( data );
}
// Get the JavaScript object, if JSON is used. // Get the JavaScript object, if JSON is used.
if ( type == "json" ) eval( "data = " + data ); if ( type == "json" )
eval( "data = " + data );
// evaluate scripts within html // evaluate scripts within html
if ( type == "html" ) jQuery("<div>").html(data).evalScripts(); if ( type == "html" )
jQuery("<div>").html(data).evalScripts();
return data; return data;
}, },
// Serialize an array of form elements or a set of // Serialize an array of form elements or a set of
// key/values into a query string // key/values into a query string
param: function(a) { param: function( a ) {
var s = []; var s = [];
// If an array was passed in, assume that it is an array // If an array was passed in, assume that it is an array
// of form elements // of form elements
if ( a.constructor == Array || a.jquery ) { if ( a.constructor == Array || a.jquery )
// Serialize the form elements // Serialize the form elements
for ( var i = 0; i < a.length; i++ ) for ( var i = 0; i < a.length; i++ )
s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) ); s.push( a[i].name + "=" + encodeURIComponent( a[i].value ) );
// Otherwise, assume that it's an object of key/value pairs // Otherwise, assume that it's an object of key/value pairs
} else { else
// Serialize the key/values // 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 the value is an array then the key names need to be repeated
if( a[j].constructor == Array ) { if ( a[j].constructor == Array )
for (var k = 0; k < a[j].length; k++) { for ( var k = 0; k < a[j].length; k++ )
s.push( j + "=" + encodeURIComponent( a[j][k] ) ); s.push( j + "=" + encodeURIComponent( a[j][k] ) );
} else
} else {
s.push( j + "=" + encodeURIComponent( a[j] ) ); s.push( j + "=" + encodeURIComponent( a[j] ) );
}
}
}
// Return the resulting serialization // Return the resulting serialization
return s.join("&"); return s.join("&");
@ -812,10 +809,10 @@ jQuery.extend({
// evalulates a script in global context // evalulates a script in global context
// not reliable for safari // not reliable for safari
globalEval: function(data) { globalEval: function( data ) {
if (window.execScript) if ( window.execScript )
window.execScript( data ); window.execScript( data );
else if(jQuery.browser.safari) else if ( jQuery.browser.safari )
// safari doesn't provide a synchronous global eval // safari doesn't provide a synchronous global eval
window.setTimeout( data, 0 ); window.setTimeout( data, 0 );
else else