Commit a5dbcaf6 authored by John Resig's avatar John Resig

Added support for:

- Cross Domain getScript
  $.getScript("http://foo.com/script.js");
- JSONP
  $.ajax({ url: "script.js", type: "jsonp" });
  $.getJSON("script.js?callback=?");
- Cross Domain JSONP/getJSON
  $.getJSON("http://foo.com/script.js?callback=?");
- No-cache Ajax Requests
  $.ajax({ url: "test.html", cache: false });
parent 456f0fe5
<?php
error_reporting(0);
$callback = $_REQUEST['callback'];
$json = $_REQUEST['json'];
if($json) {
echo $callback . '([ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ])';
} else {
echo $callback . '({ "data": {"lang": "en", "length": 25} })';
}
?>
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
<form id="form" action="formaction"> <form id="form" action="formaction">
<input type="text" name="action" value="Test" id="text1"/> <input type="text" name="action" value="Test" id="text1"/>
<input type="text" name="text2" value="Test" id="text2" disabled="disabled"/> <input type="text" name="text2" value="Test" id="text2" disabled="disabled"/>
<input type="radio" name="radio1" id="radio1"/> <input type="radio" name="radio1" id="radio1" value="on"/>
<input type="radio" name="radio2" id="radio2" checked="checked"/> <input type="radio" name="radio2" id="radio2" checked="checked"/>
<input type="checkbox" name="check" id="check1" checked="checked"/> <input type="checkbox" name="check" id="check1" checked="checked"/>
<input type="checkbox" id="check2"/> <input type="checkbox" id="check2" value="on"/>
<input type="hidden" name="hidden" id="hidden1"/> <input type="hidden" name="hidden" id="hidden1"/>
<input type="text" style="display:none;" name="foo[bar]" id="hidden2"/> <input type="text" style="display:none;" name="foo[bar]" id="hidden2"/>
......
...@@ -244,6 +244,8 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp ...@@ -244,6 +244,8 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
}; };
}); });
var jsc = (new Date).getTime();
jQuery.extend({ jQuery.extend({
/** /**
...@@ -599,30 +601,95 @@ jQuery.extend({ ...@@ -599,30 +601,95 @@ jQuery.extend({
* @see ajaxSetup(Map) * @see ajaxSetup(Map)
*/ */
ajax: function( s ) { ajax: function( s ) {
var jsonp, jsre = /=(\?|%3F)/g, status, data;
// Extend the settings, but re-extend 's' so that it can be // Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically) // checked again later (in the test suite, specifically)
s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
// if data available // convert data if not already a string
if ( s.data ) { if ( s.data && s.processData && typeof s.data != "string" )
// convert data if not already a string s.data = jQuery.param(s.data);
if ( s.processData && typeof s.data != "string" )
s.data = jQuery.param(s.data);
// append data to url for get requests // Break the data into one single string
if ( s.type.toLowerCase() == "get" ) { var q = s.url.indexOf("?");
// "?" + data or "&" + data (in case there are already params) if ( q > -1 ) {
s.url += (s.url.indexOf("?") > -1 ? "&" : "?") + s.data; s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
s.url = s.url.slice(0, q);
}
// IE likes to send both get and post data, prevent this // Handle JSONP Parameter Callbacks
s.data = null; if ( s.dataType == "jsonp" ) {
} 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) ) {
jsonp = "jsonp" + jsc++;
s.data = s.data.replace(jsre, "=" + jsonp);
// We need to make sure
// that a JSONP style response is executed properly
s.dataType = "script";
// Handle JSONP-style loading
window[ jsonp ] = function(tmp){
data = tmp;
success();
// Garbage collect
window[ jsonp ] = undefined;
try{ delete window[ jsonp ]; } catch(e){}
};
}
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 data is available, append data to url for get requests
if ( s.data && s.type.toLowerCase() == "get" ) {
s.url += "?" + s.data;
// IE likes to send both get and post data, prevent this
s.data = null;
} }
// Watch for a new set of requests // Watch for a new set of requests
if ( s.global && ! jQuery.active++ ) if ( s.global && ! jQuery.active++ )
jQuery.event.trigger( "ajaxStart" ); 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" ) {
var script = document.createElement("script");
script.src = s.url;
// Handle Script loading
if ( !jsonp && (s.success || s.complete) ) {
var done = false;
// Attach handlers for all browsers
script.onload = script.onreadystatechange = function(){
if ( !done && (!this.readyState ||
this.readyState == "loaded" || this.readyState == "complete") ) {
done = true;
success();
complete();
document.body.removeChild( script );
}
};
}
document.body.appendChild(script);
// We handle everything using the script element injection
return;
}
var requestDone = false; var requestDone = false;
// Create the request object; Microsoft failed to properly // Create the request object; Microsoft failed to properly
...@@ -645,7 +712,7 @@ jQuery.extend({ ...@@ -645,7 +712,7 @@ jQuery.extend({
xml.setRequestHeader("X-Requested-With", "XMLHttpRequest"); xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
// Allow custom headers/mimetypes // Allow custom headers/mimetypes
if( s.beforeSend ) if ( s.beforeSend )
s.beforeSend(xml); s.beforeSend(xml);
if ( s.global ) if ( s.global )
...@@ -663,7 +730,7 @@ jQuery.extend({ ...@@ -663,7 +730,7 @@ jQuery.extend({
ival = null; ival = null;
} }
var status = isTimeout == "timeout" && "timeout" || status = isTimeout == "timeout" && "timeout" ||
!jQuery.httpSuccess( xml ) && "error" || !jQuery.httpSuccess( xml ) && "error" ||
s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" || s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
"success"; "success";
...@@ -672,7 +739,7 @@ jQuery.extend({ ...@@ -672,7 +739,7 @@ jQuery.extend({
// Watch for, and catch, XML document parse errors // Watch for, and catch, XML document parse errors
try { try {
// process the data (runs the xml through httpData regardless of callback) // process the data (runs the xml through httpData regardless of callback)
var data = jQuery.httpData( xml, s.dataType ); data = jQuery.httpData( xml, s.dataType );
} catch(e) { } catch(e) {
status = "parsererror"; status = "parsererror";
} }
...@@ -688,31 +755,18 @@ jQuery.extend({ ...@@ -688,31 +755,18 @@ jQuery.extend({
if ( s.ifModified && modRes ) if ( s.ifModified && modRes )
jQuery.lastModified[s.url] = modRes; jQuery.lastModified[s.url] = modRes;
// If a local callback was specified, fire it and pass it the data // JSONP handles its own success callback
if ( s.success ) if ( !jsonp )
s.success( data, status ); success();
// Fire the global callback
if ( s.global )
jQuery.event.trigger( "ajaxSuccess", [xml, s] );
} else } else
jQuery.handleError(s, xml, status); jQuery.handleError(s, xml, status);
// The request was completed // Fire the complete handlers
if( s.global ) complete();
jQuery.event.trigger( "ajaxComplete", [xml, s] );
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active )
jQuery.event.trigger( "ajaxStop" );
// Process result
if ( s.complete )
s.complete(xml, status);
// Stop memory leaks // Stop memory leaks
if(s.async) if ( s.async )
xml = null; xml = null;
} }
}; };
...@@ -748,6 +802,30 @@ jQuery.extend({ ...@@ -748,6 +802,30 @@ jQuery.extend({
// return XMLHttpRequest to allow aborting the request etc. // return XMLHttpRequest to allow aborting the request etc.
return xml; return xml;
function success(){
// If a local callback was specified, fire it and pass it the data
if ( s.success )
s.success( data, status );
// Fire the global callback
if ( s.global )
jQuery.event.trigger( "ajaxSuccess", [xml, s] );
}
function complete(){
// Process result
if ( s.complete )
s.complete(xml, status);
// The request was completed
if ( s.global )
jQuery.event.trigger( "ajaxComplete", [xml, s] );
// Handle the global AJAX counter
if ( s.global && ! --jQuery.active )
jQuery.event.trigger( "ajaxStop" );
}
}, },
handleError: function( s, xml, status, e ) { handleError: function( s, xml, status, e ) {
...@@ -793,7 +871,7 @@ jQuery.extend({ ...@@ -793,7 +871,7 @@ jQuery.extend({
httpData: function( r, type ) { httpData: function( r, type ) {
var ct = r.getResponseHeader("content-type"); var ct = r.getResponseHeader("content-type");
var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0; var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
data = xml ? r.responseXML : r.responseText; var data = xml ? r.responseXML : r.responseText;
if ( xml && data.documentElement.tagName == "parsererror" ) if ( xml && data.documentElement.tagName == "parsererror" )
throw "parsererror"; throw "parsererror";
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment