jQuery.fn.extend({
+ // Keep a copy of the old load
+ _load: jQuery.fn.load,
+
load: function( url, params, callback ) {
- if ( jQuery.isFunction( url ) )
- return this.bind("load", url);
+ if ( typeof url != 'string' )
+ return this._load( url );
var off = url.indexOf(" ");
if ( off >= 0 ) {
jQuery.ajax({
url: url,
type: type,
+ dataType: "html",
data: params,
complete: function(res, status){
// If successful, inject the HTML into all the matched elements
jQuery.makeArray(this.elements) : this;
})
.filter(function(){
- return this.name && !this.disabled &&
- (this.checked || /select|textarea/i.test(this.nodeName) ||
+ return this.name && !this.disabled &&
+ (this.checked || /select|textarea/i.test(this.nodeName) ||
/text|hidden|password/i.test(this.type));
})
.map(function(i, elem){
};
});
-var jsc = (new Date).getTime();
+var jsc = now();
jQuery.extend({
get: function( url, data, callback, type ) {
callback = data;
data = null;
}
-
+
return jQuery.ajax({
type: "GET",
url: url,
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)
// 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);
+ 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
// Garbage collect
window[ jsonp ] = undefined;
try{ delete window[ jsonp ]; } catch(e){}
+ if ( head )
+ head.removeChild( script );
};
}
s.cache = false;
if ( s.cache === false && s.type.toLowerCase() == "get" ) {
- var ts = (new Date()).getTime();
+ var ts = now();
// try replacing _= if it is there
var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
// if nothing was replaced, add timestamp to the end
if ( s.global && ! jQuery.active++ )
jQuery.event.trigger( "ajaxStart" );
+ // Matches an absolute URL, and saves the domain
+ var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
+
// If we're requesting a remote document
// and trying to load JSON or Script with a GET
- if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
+ if ( s.dataType == "script" && s.type.toLowerCase() == "get"
+ && remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
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 ) {
// Attach handlers for all browsers
script.onload = script.onreadystatechange = function(){
- if ( !done && (!this.readyState ||
+ if ( !done && (!this.readyState ||
this.readyState == "loaded" || this.readyState == "complete") ) {
done = true;
success();
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);
+ xml.open(s.type, s.url, s.async, s.username, s.password);
// Need an extra try/catch for cross domain requests in Firefox 3
try {
// 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);
-
+ if ( s.beforeSend && s.beforeSend(xml, s) === false ) {
+ // cleanup active request counter
+ s.global && jQuery.active--;
+ // close opended socket
+ xml.abort();
+ return false;
+ }
+
if ( s.global )
jQuery.event.trigger("ajaxSend", [xml, s]);
// The transfer is complete and the data is available, or the request timed out
if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
requestDone = true;
-
+
// clear poll interval
if (ival) {
clearInterval(ival);
ival = null;
}
-
+
status = isTimeout == "timeout" && "timeout" ||
!jQuery.httpSuccess( xml ) && "error" ||
s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
try {
modRes = xml.getResponseHeader("Last-Modified");
} catch(e) {} // swallow exception thrown by FF if header is not available
-
+
if ( s.ifModified && modRes )
jQuery.lastModified[s.url] = modRes;
// JSONP handles its own success callback
if ( !jsonp )
- success();
+ success();
} else
jQuery.handleError(s, xml, status);
xml = null;
}
};
-
+
if ( s.async ) {
// don't attach the handler to the request, just poll it instead
- var ival = setInterval(onreadystatechange, 13);
+ var ival = setInterval(onreadystatechange, 13);
// Timeout checker
if ( s.timeout > 0 )
if ( xml ) {
// Cancel the request
xml.abort();
-
+
if( !requestDone )
onreadystatechange( "timeout" );
}
}, s.timeout);
}
-
+
// Send the data
try {
xml.send(s.data);
} catch(e) {
jQuery.handleError(s, xml, null, e);
}
-
+
// 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 ) {
},
httpData: function( r, type ) {
- var ct = r.getResponseHeader("content-type");
- var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
- var data = xml ? r.responseXML : r.responseText;
+ var ct = r.getResponseHeader("content-type"),
+ xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
+ data = xml ? r.responseXML : r.responseText;
if ( xml && data.documentElement.tagName == "parsererror" )
throw "parsererror";
s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
});
else
- s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
+ s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
// Return the resulting serialization
return s.join("&").replace(/%20/g, "+");
git.asbjorn.biz / jquery.git / blobdiff