jQuery.ajax({
url: url,
type: type,
+ dataType: "html",
data: params,
complete: function(res, status){
// If successful, inject the HTML into all the matched elements
// If not, just inject the full result
res.responseText );
- // Add delay to account for Safari's delay in globalEval
- setTimeout(function(){
- self.each( callback, [res.responseText, status, res] );
- }, 13);
+ self.each( callback, [res.responseText, status, res] );
}
});
return this;
serialize: function() {
return jQuery.param(this.serializeArray());
},
-\r serializeArray: function() {\r
+ serializeArray: function() {
return this.map(function(){
return jQuery.nodeName(this, "form") ?
jQuery.makeArray(this.elements) : this;
(this.checked || /select|textarea/i.test(this.nodeName) ||
/text|hidden|password/i.test(this.type));
})
- .map(function(i, elem){\r var val = jQuery(this).val();
+ .map(function(i, elem){
+ var val = jQuery(this).val();
return val == null ? null :
val.constructor == Array ?
- jQuery.map( val, function(i, val){\r return {name: elem.name, value: val};
+ jQuery.map( val, function(val, i){
+ return {name: elem.name, value: val};
}) :
- {name: elem.name, value: val};\r
- }).get();\r }
+ {name: elem.name, value: val};
+ }).get();
+ }
});
// Attach a bunch of functions for handling common AJAX events
contentType: "application/x-www-form-urlencoded",
processData: true,
async: true,
- data: null
+ data: null,
+ username: null,
+ password: null,
+ accepts: {
+ xml: "application/xml, text/xml",
+ html: "text/html",
+ script: "text/javascript, application/javascript",
+ json: "application/json, text/javascript",
+ text: "text/plain",
+ _default: "*/*"
+ }
},
// Last-Modified header cache for next request
lastModified: {},
ajax: function( s ) {
- var jsonp, jsre = /=(\?|%3F)/g, status, data;
+ var jsonp, jsre = /=\?(&|$)/g, status, data;
// Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically)
if ( s.data && s.processData && typeof s.data != "string" )
s.data = jQuery.param(s.data);
- // Break the data into one single string
- var q = s.url.indexOf("?");
- if ( q > -1 ) {
- s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
- s.url = s.url.slice(0, q);
- }
-
// Handle JSONP Parameter Callbacks
if ( s.dataType == "jsonp" ) {
- if ( !s.data || !s.data.match(jsre) )
+ if ( s.type.toLowerCase() == "get" ) {
+ if ( !s.url.match(jsre) )
+ s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+ } else if ( !s.data || !s.data.match(jsre) )
s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
s.dataType = "json";
}
// Build temporary JSONP function
- if ( s.dataType == "json" && s.data && s.data.match(jsre) ) {
+ if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
jsonp = "jsonp" + jsc++;
- s.data = s.data.replace(jsre, "=" + jsonp);
+
+ // Replace the =? sequence both in the query string and the data
+ if ( s.data )
+ s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+ s.url = s.url.replace(jsre, "=" + jsonp + "$1");
// We need to make sure
// that a JSONP style response is executed properly
window[ jsonp ] = function(tmp){
data = tmp;
success();
+ complete();
// Garbage collect
window[ jsonp ] = undefined;
try{ delete window[ jsonp ]; } catch(e){}
+ if ( head )
+ head.removeChild( script );
};
}
if ( s.dataType == "script" && s.cache == null )
s.cache = false;
- if ( s.cache === false && s.type.toLowerCase() == "get" )
- s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime();
+ if ( s.cache === false && s.type.toLowerCase() == "get" ) {
+ var ts = (new Date()).getTime();
+ // try replacing _= if it is there
+ var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+ // if nothing was replaced, add timestamp to the end
+ s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+ }
// If data is available, append data to url for get requests
if ( s.data && s.type.toLowerCase() == "get" ) {
- s.url += "?" + s.data;
+ s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
// IE likes to send both get and post data, prevent this
s.data = null;
jQuery.event.trigger( "ajaxStart" );
// If we're requesting a remote document
- // and trying to load JSON or Script
- if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+ // and trying to load JSON or Script with a GET
+ if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
+ var head = document.getElementsByTagName("head")[0];
var script = document.createElement("script");
script.src = s.url;
+ if (s.scriptCharset)
+ script.charset = s.scriptCharset;
// Handle Script loading
- if ( !jsonp && (s.success || s.complete) ) {
+ if ( !jsonp ) {
var done = false;
// Attach handlers for all browsers
done = true;
success();
complete();
- document.body.removeChild( script );
+ head.removeChild( script );
}
};
}
- document.body.appendChild(script);
+ head.appendChild(script);
// We handle everything using the script element injection
- return;
+ return undefined;
}
var requestDone = false;
var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
// Open the socket
- xml.open(s.type, s.url, s.async);
-
- // Set the correct header, if data is being sent
- if ( s.data )
- xml.setRequestHeader("Content-Type", s.contentType);
-
- // Set the If-Modified-Since header, if ifModified mode.
- if ( s.ifModified )
- xml.setRequestHeader("If-Modified-Since",
- jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+ xml.open(s.type, s.url, s.async, s.username, s.password);
- // Set header so the called script knows that it's an XMLHttpRequest
- xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+ // 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 )
+ xml.setRequestHeader("Content-Type", s.contentType);
+
+ // Set the If-Modified-Since header, if ifModified mode.
+ if ( s.ifModified )
+ xml.setRequestHeader("If-Modified-Since",
+ jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+
+ // Set header so the called script knows that it's an XMLHttpRequest
+ xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+ // Set the Accepts header for the server, depending on the dataType
+ xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+ s.accepts[ s.dataType ] + ", */*" :
+ s.accepts._default );
+ } catch(e){}
// Allow custom headers/mimetypes
if ( s.beforeSend )
- s.beforeSend(xml);
+ var beforeSendSuccess = s.beforeSend(xml, s);
+ if( beforeSendSuccess === false )
+ return false;
+
if ( s.global )
- jQuery.event.trigger("ajaxSend", [xml, s]);
+ jQuery.event.trigger("ajaxSend", [xml, s]);
// Wait for a response to come back
var onreadystatechange = function(isTimeout){
// firefox 1.5 doesn't fire statechange for sync requests
if ( !s.async )
onreadystatechange();
-
- // return XMLHttpRequest to allow aborting the request etc.
- return xml;
function success(){
// If a local callback was specified, fire it and pass it the data
if ( s.global && ! --jQuery.active )
jQuery.event.trigger( "ajaxStop" );
}
+
+ // return XMLHttpRequest to allow aborting the request etc.
+ return xml;
},
handleError: function( s, xml, status, e ) {
// Determines if an XMLHttpRequest was successful or not
httpSuccess: function( r ) {
try {
+ // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
return !r.status && location.protocol == "file:" ||
- ( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
+ ( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
jQuery.browser.safari && r.status == undefined;
} catch(e){}
return false;
git.asbjorn.biz / jquery.git / blobdiff