var jsc = now(),
- rscript = /<script(.|\s)*?\/script>/g,
+ rscript = /<script(.|\s)*?\/script>/gi,
rselectTextarea = /select|textarea/i,
- rinput = /text|hidden|password|search/i,
+ rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
jsre = /=\?(&|$)/,
rquery = /\?/,
rts = /(\?|&)_=.*?(&|$)/,
load: function( url, params, callback ) {
if ( typeof url !== "string" ) {
return this._load( url );
+
+ // Don't do a request if no elements are being requested
+ } else if ( !this.length ) {
+ return this;
}
var off = url.indexOf(" ");
lastModified: {},
etag: {},
- ajax: function( s ) {
- // Extend the settings, but re-extend 's' so that it can be
- // checked again later (in the test suite, specifically)
- s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+ ajax: function( origSettings ) {
+ var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
var jsonp, status, data,
- callbackContext = s.context || window,
+ callbackContext = s.context || s,
type = s.type.toUpperCase();
// convert data if not already a string
// Build temporary JSONP function
if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
- jsonp = "jsonp" + jsc++;
+ jsonp = s.jsonpCallback || ("jsonp" + jsc++);
// Replace the =? sequence both in the query string and the data
if ( s.data ) {
s.dataType = "script";
// Handle JSONP-style loading
- window[ jsonp ] = function(tmp){
+ window[ jsonp ] = window[ jsonp ] || function(tmp){
data = tmp;
success();
complete();
}
// Matches an absolute URL, and saves the domain
- var parts = rurl.exec( s.url );
+ var parts = rurl.exec( s.url ),
+ remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
// If we're requesting a remote document
// and trying to load JSON or Script with a GET
- if ( s.dataType === "script" && type === "GET" && parts
- && ( parts[1] && parts[1] !== location.protocol || parts[2] !== location.host )) {
-
+ if ( s.dataType === "script" && type === "GET" && remote ) {
var head = document.getElementsByTagName("head")[0] || document.documentElement;
var script = document.createElement("script");
script.src = s.url;
// Need an extra try/catch for cross domain requests in Firefox 3
try {
// Set the correct header, if data is being sent
- if ( s.data ) {
+ if ( s.data || origSettings && origSettings.contentType ) {
xhr.setRequestHeader("Content-Type", s.contentType);
}
- // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
- if ( s.ifModified ) {
- if ( jQuery.lastModified[s.url] ) {
- xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
- }
+ // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+ if ( s.ifModified ) {
+ if ( jQuery.lastModified[s.url] ) {
+ xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+ }
- if ( jQuery.etag[s.url] ) {
- xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
- }
+ if ( jQuery.etag[s.url] ) {
+ xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
}
+ }
// Set header so the called script knows that it's an XMLHttpRequest
- xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+ // Only send the header if it's not a remote XHR
+ if ( !remote ) {
+ xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+ }
// Set the Accepts header for the server, depending on the dataType
xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
// Fire the complete handlers
complete();
- if ( isTimeout ) {
+ if ( isTimeout === "timeout" ) {
xhr.abort();
}
xhr.send( type === "POST" || type === "PUT" ? s.data : null );
} catch(e) {
jQuery.handleError(s, xhr, null, e);
+ // Fire the complete handlers
+ complete();
}
// firefox 1.5 doesn't fire statechange for sync requests
function success(){
// If a local callback was specified, fire it and pass it the data
if ( s.success ) {
- s.success.call( callbackContext, data, status );
+ s.success.call( callbackContext, data, status, xhr );
}
// Fire the global callback
// Serialize an array of form elements or a set of
// key/values into a query string
param: function( a ) {
+
var s = [],
- param_traditional = jQuery.param.traditional;
+
+ // Set jQuery.param.traditional to true for jQuery <= 1.3.2 behavior.
+ traditional = jQuery.param.traditional;
function add( key, value ){
// If value is a function, invoke it and return its value
s[ s.length ] = encodeURIComponent(key) + '=' + encodeURIComponent(value);
}
- // If an array was passed in, assume that it is an array
- // of form elements
- if ( jQuery.isArray(a) || a.jquery )
+ // If an array was passed in, assume that it is an array of form elements.
+ if ( jQuery.isArray(a) || a.jquery ) {
// Serialize the form elements
jQuery.each( a, function() {
add( this.name, this.value );
});
- else
- // Encode parameters from object, recursively. If
- // jQuery.param.traditional is set, encode the "old" way
- // (the way 1.3.2 or older did it)
+ } else {
+ // If jQuery.param.traditional is true, encode the "old" way (the
+ // way 1.3.2 or older did it), otherwise encode params recursively.
jQuery.each( a, function buildParams( prefix, obj ) {
- if ( jQuery.isArray(obj) )
+ if ( jQuery.isArray(obj) ) {
+ // Serialize array item.
jQuery.each( obj, function(i,v){
- // Due to rails' limited request param syntax, numeric array
- // indices are not supported. To avoid serialization ambiguity
- // issues, serialized arrays can only contain scalar values. php
- // does not have this issue, but we should go with the lowest
- // common denominator
- add( prefix + ( param_traditional ? "" : "[]" ), v );
+ if ( traditional ) {
+ // Treat each array item as a scalar.
+ add( prefix, v );
+ } else {
+ // If array item is non-scalar (array or object), encode its
+ // numeric index to resolve deserialization ambiguity issues.
+ // Note that rack (as of 1.0.0) can't currently deserialize
+ // nested arrays properly, and attempting to do so may cause
+ // a server error. Possible fixes are to modify rack's
+ // deserialization algorithm or to provide an option or flag
+ // to force array serialization to be shallow.
+ buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
+ }
});
- else if ( typeof obj == "object" )
- if ( param_traditional )
- add( prefix, obj );
-
- else
- jQuery.each( obj, function(k,v){
- buildParams( prefix ? prefix + "[" + k + "]" : k, v );
- });
+ } else if ( !traditional && typeof obj === "object" ) {
+ // Serialize object item.
+ jQuery.each( obj, function(k,v){
+ buildParams( prefix + "[" + k + "]", v );
+ });
- else
+ } else {
+ // Serialize scalar item.
add( prefix, obj );
-
+ }
});
-
+ }
+
// Return the resulting serialization
return s.join("&").replace(r20, "+");
}
git.asbjorn.biz / jquery.git / blobdiff