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
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);
+ s.url = s.url.replace(jsre, "=" + jsonp);
// 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){}
s.cache = false;
if ( s.cache === false && s.type.toLowerCase() == "get" )
- s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime();
+ s.url += (s.url.match(/\?/) ? "&" : "?") + "_=" + (new Date()).getTime();
// 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;
// If we're requesting a remote document
// and trying to load JSON or Script
if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+ var head = document.getElementsByTagName("head")[0];
var script = document.createElement("script");
script.src = s.url;
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;