X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=59c231c9b33e52c73c6f69d17c57db35b1ae173e;hb=ddb86f8d5bd1bd21b2beeeea55baf505b47dfed5;hp=4b22205213e386b55e3de04808877b5ba111921f;hpb=36ebb4f75ed2d6684c132ddbeb9a05ef015fbc90;p=jquery.git
diff --git a/src/ajax.js b/src/ajax.js
index 4b22205..59c231c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -15,6 +15,10 @@ jQuery.fn.extend({
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(" ");
@@ -41,21 +45,20 @@ jQuery.fn.extend({
}
}
- 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("")
+ jQuery("")
// inject the contents of the document in, removing the scripts
// to avoid any 'Permission Denied' errors in IE
.append(res.responseText.replace(rscript, ""))
@@ -68,7 +71,7 @@ jQuery.fn.extend({
}
if ( callback ) {
- self.each( callback, [res.responseText, status, res] );
+ this.each( callback, [res.responseText, status, res] );
}
}
});
@@ -103,7 +106,7 @@ jQuery.fn.extend({
});
// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function(i,o){
jQuery.fn[o] = function(f){
return this.bind(o, f);
};
@@ -112,8 +115,9 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
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;
}
@@ -136,7 +140,9 @@ jQuery.extend({
},
post: function( url, data, callback, type ) {
+ // shift arguments if data argument was omited
if ( jQuery.isFunction( data ) ) {
+ type = type || callback;
callback = data;
data = {};
}
@@ -192,9 +198,10 @@ jQuery.extend({
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));
-
+ s = jQuery.extend(true, {}, jQuery.ajaxSettings, s);
+
var jsonp, status, data,
+ callbackContext = s.context || window,
type = s.type.toUpperCase();
// convert data if not already a string
@@ -268,14 +275,13 @@ jQuery.extend({
}
// 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 )) {
-
- var head = document.getElementsByTagName("head")[0];
+ if ( s.dataType === "script" && type === "GET" && remote ) {
+ var head = document.getElementsByTagName("head")[0] || document.documentElement;
var script = document.createElement("script");
script.src = s.url;
if ( s.scriptCharset ) {
@@ -331,19 +337,22 @@ jQuery.extend({
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 ] ?
@@ -352,7 +361,7 @@ jQuery.extend({
} 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" );
@@ -364,7 +373,7 @@ jQuery.extend({
}
if ( s.global ) {
- jQuery.event.trigger("ajaxSend", [xhr, s]);
+ trigger("ajaxSend", [xhr, s]);
}
// Wait for a response to come back
@@ -454,6 +463,8 @@ jQuery.extend({
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
@@ -464,24 +475,24 @@ jQuery.extend({
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, xhr );
}
// 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
@@ -489,6 +500,10 @@ jQuery.extend({
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;
@@ -497,12 +512,12 @@ jQuery.extend({
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] );
}
},
@@ -578,12 +593,15 @@ jQuery.extend({
// Serialize an array of form elements or a set of
// key/values into a query string
param: function( a ) {
- var s = [];
-
+ var s = [],
+ param_traditional = jQuery.param.traditional;
+
function add( key, value ){
+ // If value is a function, invoke it and return its value
+ value = jQuery.isFunction(value) ? value() : 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 ) {
@@ -591,27 +609,37 @@ jQuery.extend({
jQuery.each( a, function() {
add( this.name, this.value );
});
+
} else {
- // Recursively encode parameters from object,
- // building a prefix path as we go down
- function buildParams(obj, prefix)
- {
+ // Encode parameters from object, recursively. If
+ // jQuery.param.traditional is set, encode the "old" way
+ // (the way 1.3.2 or older did it)
+ jQuery.each( a, function buildParams( prefix, obj ) {
+
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) );
+ 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 );
+ });
+
+ } 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 {
- add( prefix, jQuery.isFunction(obj) ? obj() : obj );
+ add( prefix, obj );
}
- }
- buildParams(a);
+ });
}
-
// Return the resulting serialization
return s.join("&").replace(r20, "+");
}