Permalink
Browse files

Merge branch 'master' of github.com:jquery/jquery

  • Loading branch information...
2 parents 2c29070 + bab8079 commit 6344821f1bc394115fb3c869ab7b65b75cfc9cc5 @jeresig jeresig committed Jan 26, 2011
Showing with 88 additions and 51 deletions.
  1. +29 −22 src/ajax.js
  2. +1 −1 src/ajax/jsonp.js
  3. +3 −6 src/ajax/xhr.js
  4. +0 −3 src/core.js
  5. +55 −19 test/unit/ajax.js
View
@@ -7,15 +7,13 @@ var r20 = /%20/g,
rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
rnoContent = /^(?:GET|HEAD)$/,
+ rprotocol = /^\/\//,
rquery = /\?/,
rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
rselectTextarea = /^(?:select|textarea)/i,
rspacesAjax = /\s+/,
rts = /([?&])_=[^&]*/,
- rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/,
-
- // Slice function
- sliceFunc = Array.prototype.slice,
+ rurl = /^(\w+:)\/\/([^\/?#:]+)(?::(\d+))?/,
// Keep a copy of the old load method
_load = jQuery.fn.load,
@@ -75,7 +73,7 @@ function addToPrefiltersOrTransports( structure ) {
}
//Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions,
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jXHR,
dataType /* internal */, inspected /* internal */ ) {
dataType = dataType || options.dataTypes[ 0 ];
@@ -99,15 +97,15 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions,
} else {
options.dataTypes.unshift( selection );
selection = inspectPrefiltersOrTransports(
- structure, options, originalOptions, selection, inspected );
+ structure, options, originalOptions, jXHR, selection, inspected );
}
}
}
// If we're only executing or nothing was selected
// we try the catchall dataType if not done already
if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
selection = inspectPrefiltersOrTransports(
- structure, options, originalOptions, "*", inspected );
+ structure, options, originalOptions, jXHR, "*", inspected );
}
// unnecessary when only executing (prefilters)
// but it'll be ignored by the caller in that case
@@ -400,8 +398,9 @@ jQuery.extend({
// Cancel the request
abort: function( statusText ) {
+ statusText = statusText || "abort";
if ( transport ) {
- transport.abort( statusText || "abort" );
+ transport.abort( statusText );
}
done( 0, statusText );
return this;
@@ -438,7 +437,7 @@ jQuery.extend({
var isSuccess,
success,
- error = ( statusText = statusText || "error" ),
+ error,
response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
lastModified,
etag;
@@ -476,6 +475,16 @@ jQuery.extend({
error = "" + e;
}
}
+ } else {
+ // We extract error from statusText
+ // then normalize statusText and status for non-aborts
+ error = statusText;
+ if( status ) {
+ statusText = "error";
+ if ( status < 0 ) {
+ status = 0;
+ }
+ }
}
// Set data for the fake xhr object
@@ -533,21 +542,20 @@ jQuery.extend({
};
// Remove hash character (#7531: and string promotion)
+ // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
// We also use the url parameter if available
- s.url = ( "" + ( url || s.url ) ).replace( rhash, "" );
+ s.url = ( "" + ( url || s.url ) ).replace( rhash, "" ).replace( rprotocol, protocol + "//" );
// Extract dataTypes list
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
// Determine if a cross-domain request is in order
if ( !s.crossDomain ) {
parts = rurl.exec( s.url.toLowerCase() );
- s.crossDomain = !!(
- parts &&
- ( parts[ 1 ] && parts[ 1 ] != protocol ||
- parts[ 2 ] != loc.hostname ||
- ( parts[ 3 ] || ( ( parts[ 1 ] || protocol ) === "http:" ? 80 : 443 ) ) !=
- ( loc.port || ( protocol === "http:" ? 80 : 443 ) ) )
+ s.crossDomain = !!( parts &&
+ ( parts[ 1 ] != protocol || parts[ 2 ] != loc.hostname ||
+ ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+ ( loc.port || ( protocol === "http:" ? 80 : 443 ) ) )
);
}
@@ -557,7 +565,7 @@ jQuery.extend({
}
// Apply prefilters
- inspectPrefiltersOrTransports( prefilters, s, options );
+ inspectPrefiltersOrTransports( prefilters, s, options, jXHR );
// Uppercase the type
s.type = s.type.toUpperCase();
@@ -630,11 +638,11 @@ jQuery.extend({
}
// Get transport
- transport = inspectPrefiltersOrTransports( transports, s, options );
+ transport = inspectPrefiltersOrTransports( transports, s, options, jXHR );
// If no transport, we auto-abort
if ( !transport ) {
- done( 0, "notransport" );
+ done( -1, "No Transport" );
} else {
// Set state as sending
state = jXHR.readyState = 1;
@@ -653,9 +661,8 @@ jQuery.extend({
transport.send( requestHeaders, done );
} catch (e) {
// Propagate exception as error if not done
- if ( status === 1 ) {
- done( 0, "error", "" + e );
- jXHR = false;
+ if ( status < 2 ) {
+ done( -1, "" + e );
// Simply rethrow otherwise
} else {
jQuery.error( e );
View
@@ -1,7 +1,7 @@
(function( jQuery ) {
var jsc = jQuery.now(),
- jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i;
+ jsre = /(\=)\?(&|$)|()\?\?()/i;
// Default jsonp settings
jQuery.ajaxSetup({
View
@@ -108,12 +108,9 @@ if ( jQuery.support.ajax ) {
} catch( _ ) {}
// Do send the request
- try {
- xhr.send( ( s.hasContent && s.data ) || null );
- } catch( e ) {
- complete( 0, "error", "" + e );
- return;
- }
+ // This may raise an exception which is actually
+ // handled in jQuery.ajax (so no try/catch here)
+ xhr.send( ( s.hasContent && s.data ) || null );
// Listener
callback = function( _, isAbort ) {
View
@@ -26,9 +26,6 @@ var jQuery = function( selector, context ) {
trimLeft = /^\s+/,
trimRight = /\s+$/,
- // Check for non-word characters
- rnonword = /\W/,
-
// Check for digits
rdigit = /\d/,
View
@@ -240,6 +240,47 @@ test("jQuery.ajax() - error callbacks", function() {
});
});
+test("jQuery.ajax() - textStatus and errorThrown values", function() {
+
+ var nb = 3;
+
+ expect( 2 * nb );
+ stop();
+
+ function startN() {
+ if ( !( --nb ) ) {
+ start();
+ }
+ }
+
+ jQuery.ajax({
+ url: url("data/nonExistingURL"),
+ error: function( _ , textStatus , errorThrown ){
+ strictEqual( textStatus, "error", "textStatus is 'error' for 404" );
+ strictEqual( errorThrown, "Not Found", "errorThrown is 'Not Found' for 404");
+ startN();
+ }
+ });
+
+ jQuery.ajax({
+ url: url("data/name.php?wait=5"),
+ error: function( _ , textStatus , errorThrown ){
+ strictEqual( textStatus, "abort", "textStatus is 'abort' for abort" );
+ strictEqual( errorThrown, "abort", "errorThrown is 'abort' for abort");
+ startN();
+ }
+ }).abort();
+
+ jQuery.ajax({
+ url: url("data/name.php?wait=5"),
+ error: function( _ , textStatus , errorThrown ){
+ strictEqual( textStatus, "mystatus", "textStatus is 'mystatus' for abort('mystatus')" );
+ strictEqual( errorThrown, "mystatus", "errorThrown is 'mystatus' for abort('mystatus')");
+ startN();
+ }
+ }).abort( "mystatus" );
+});
+
test("jQuery.ajax() - responseText on error", function() {
expect( 1 );
@@ -374,6 +415,18 @@ test(".ajax() - contentType" , function() {
});
+test(".ajax() - protocol-less urls", function() {
+ expect(1);
+
+ jQuery.ajax({
+ url: "//somedomain.com",
+ beforeSend: function( xhr, settings ) {
+ equals(settings.url, location.protocol + "//somedomain.com", "Make sure that the protocol is added.");
+ return false;
+ }
+ });
+});
+
test(".ajax() - hash", function() {
expect(3);
@@ -1158,10 +1211,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
test("jQuery.ajax() - JSONP, " + label, function() {
- expect(17);
+ expect(16);
var count = 0;
- function plus(){ if ( ++count == 17 ) start(); }
+ function plus(){ if ( ++count == 16 ) start(); }
stop();
@@ -1269,23 +1322,6 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
url: "data/jsonp.php",
dataType: "jsonp",
crossDomain: crossDomain,
- data: {
- callback: "?"
- },
- success: function(data){
- ok( data.data, "JSON results returned (GET, processed data callback)" );
- plus();
- },
- error: function(data){
- ok( false, "Ajax error JSON (GET, processed data callback)" );
- plus();
- }
- });
-
- jQuery.ajax({
- url: "data/jsonp.php",
- dataType: "jsonp",
- crossDomain: crossDomain,
jsonp: "callback",
success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" );

0 comments on commit 6344821

Please sign in to comment.