+var jsc = now(),
+ rscript = /<script(.|\s)*?\/script>/g,
+ rselectTextarea = /select|textarea/i,
+ rinput = /text|hidden|password|search/i,
+ jsre = /=\?(&|$)/,
+ rquery = /\?/,
+ rts = /(\?|&)_=.*?(&|$)/,
+ rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+ r20 = /%20/g;
+
jQuery.fn.extend({
// Keep a copy of the old load
_load: jQuery.fn.load,
}
}
- var self = this;
-
// Request the remote document
jQuery.ajax({
url: url,
type: type,
dataType: "html",
data: params,
+ context:this,
complete: function(res, status){
// If successful, inject the HTML into all the matched elements
if ( status === "success" || status === "notmodified" ) {
// See if a selector was specified
- self.html( selector ?
+ this.html( selector ?
// Create a dummy div to hold the results
- jQuery("<div/>")
+ jQuery("<div />")
// inject the contents of the document in, removing the scripts
// to avoid any 'Permission Denied' errors in IE
- .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+ .append(res.responseText.replace(rscript, ""))
// Locate the specified elements
.find(selector) :
}
if ( callback ) {
- self.each( callback, [res.responseText, status, res] );
+ this.each( callback, [res.responseText, status, res] );
}
}
});
})
.filter(function(){
return this.name && !this.disabled &&
- (this.checked || /select|textarea/i.test(this.nodeName) ||
- /text|hidden|password|search/i.test(this.type));
+ (this.checked || rselectTextarea.test(this.nodeName) ||
+ rinput.test(this.type));
})
.map(function(i, elem){
var val = jQuery(this).val();
};
});
-var jsc = now();
-
jQuery.extend({
get: function( url, data, callback, type ) {
- // shift arguments if data argument was ommited
+ // shift arguments if data argument was omited
if ( jQuery.isFunction( data ) ) {
+ type = type || callback;
callback = data;
data = null;
}
},
post: function( url, data, callback, type ) {
+ // shift arguments if data argument was omited
if ( jQuery.isFunction( data ) ) {
+ type = type || callback;
callback = data;
data = {};
}
// 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));
-
- var jsonp, jsre = /=\?(&|$)/, status, data,
+
+ var jsonp, status, data,
+ callbackContext = s.context || window,
type = s.type.toUpperCase();
// convert data if not already a string
if ( s.dataType === "jsonp" ) {
if ( type === "GET" ) {
if ( !jsre.test( s.url ) ) {
- s.url += (/\?/.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+ s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
}
} else if ( !s.data || !jsre.test(s.data) ) {
s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
var ts = now();
// try replacing _= if it is there
- var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+ var ret = s.url.replace(rts, "$1_=" + ts + "$2");
// if nothing was replaced, add timestamp to the end
- s.url = ret + ((ret === s.url) ? (/\?/.test(s.url) ? "&" : "?") + "_=" + ts : "");
+ s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
}
// If data is available, append data to url for get requests
if ( s.data && type === "GET" ) {
- s.url += (/\?/.test(s.url) ? "&" : "?") + s.data;
+ s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
}
// Watch for a new set of requests
}
// Matches an absolute URL, and saves the domain
- var parts = /^(\w+:)?\/\/([^\/?#]+)/.exec( s.url );
+ var parts = rurl.exec( s.url );
// 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 )) {
- var head = document.getElementsByTagName("head")[0];
+ var head = document.getElementsByTagName("head")[0] || document.documentElement;
var script = document.createElement("script");
script.src = s.url;
if ( s.scriptCharset ) {
// Handle memory leak in IE
script.onload = script.onreadystatechange = null;
- head.removeChild( script );
+ if ( head && script.parentNode ) {
+ head.removeChild( script );
+ }
}
};
}
} catch(e){}
// Allow custom headers/mimetypes and early abort
- if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
+ if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active ) {
jQuery.event.trigger( "ajaxStop" );
}
if ( s.global ) {
- jQuery.event.trigger("ajaxSend", [xhr, s]);
+ trigger("ajaxSend", [xhr, s]);
}
// Wait for a response to come back
var onreadystatechange = function(isTimeout){
// The request was aborted, clear the interval and decrement jQuery.active
- if ( xhr.readyState === 0 ) {
+ if ( !xhr || xhr.readyState === 0 ) {
if ( ival ) {
// clear poll interval
clearInterval( ival );
// Send the data
try {
- xhr.send( type === "POST" ? s.data : null );
+ xhr.send( type === "POST" || type === "PUT" ? s.data : null );
} catch(e) {
jQuery.handleError(s, xhr, null, e);
}
function success(){
// If a local callback was specified, fire it and pass it the data
if ( s.success ) {
- s.success( data, status );
+ s.success.call( callbackContext, data, status );
}
// Fire the global callback
if ( s.global ) {
- jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
+ trigger( "ajaxSuccess", [xhr, s] );
}
}
function complete(){
// Process result
if ( s.complete ) {
- s.complete(xhr, status);
+ s.complete.call( callbackContext, xhr, status);
}
// The request was completed
if ( s.global ) {
- jQuery.event.trigger( "ajaxComplete", [xhr, s] );
+ trigger( "ajaxComplete", [xhr, s] );
}
// Handle the global AJAX counter
jQuery.event.trigger( "ajaxStop" );
}
}
+
+ function trigger(type, args){
+ (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
+ }
// return XMLHttpRequest to allow aborting the request etc.
return xhr;
handleError: function( s, xhr, status, e ) {
// If a local callback was specified, fire it
if ( s.error ) {
- s.error( xhr, status, e );
+ s.error.call( s.context || window, xhr, status, e );
}
// Fire the global callback
if ( s.global ) {
- jQuery.event.trigger( "ajaxError", [xhr, s, e] );
+ (s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
}
},
// Determines if an XMLHttpRequest returns NotModified
httpNotModified: function( xhr, url ) {
- var last_modified = xhr.getResponseHeader("Last-Modified"),
+ var lastModified = xhr.getResponseHeader("Last-Modified"),
etag = xhr.getResponseHeader("Etag");
- if ( last_modified ) {
- jQuery.lastModified[url] = last_modified;
+ if ( lastModified ) {
+ jQuery.lastModified[url] = lastModified;
}
if ( etag ) {
// of form elements
if ( jQuery.isArray(a) || a.jquery ) {
// Serialize the form elements
- jQuery.each( a, function(){
+ jQuery.each( a, function() {
add( this.name, this.value );
});
-
- // Otherwise, assume that it's an object of key/value pairs
} else {
- // Serialize the key/values
- for ( var j in a ) {
- // If the value is an array then the key names need to be repeated
- if ( jQuery.isArray(a[j]) ) {
- jQuery.each( a[j], function(){
- add( j, this );
- });
+ // Recursively encode parameters from object,
+ // building a prefix path as we go down
+ function buildParams(obj, prefix)
+ {
+ if ( jQuery.isArray(obj) ) {
+ for ( var i = 0, length = obj.length; i < length; i++ ) {
+ buildParams( obj[i], prefix );
+ };
+ } else if( typeof(obj) == "object" ) {
+ for ( var j in obj ) {
+ var postfix = ((j.indexOf("[]") > 0) ? "[]" : ""); // move any brackets to the end
+ buildParams(obj[j], (prefix ? (prefix+"["+j.replace("[]", "")+"]"+postfix) : j) );
+ }
} else {
- add( j, jQuery.isFunction(a[j]) ? a[j]() : a[j] );
+ add( prefix, jQuery.isFunction(obj) ? obj() : obj );
}
}
+ buildParams(a);
}
// Return the resulting serialization
- return s.join("&").replace(/%20/g, "+");
+ return s.join("&").replace(r20, "+");
}
});
git.asbjorn.biz / jquery.git / blobdiff