From 155ecf42a0033785160e071507f0795b3c86a32b Mon Sep 17 00:00:00 2001 From: John Resig Date: Sat, 16 Jan 2010 10:11:01 -0500 Subject: [PATCH] Make sure regular settings object is set as context for all Ajax requests, if none is specified. Fixes #5838. --- src/ajax.js | 2 +- test/unit/ajax.js | 50 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index 3c199af..f1de0f8 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -530,7 +530,7 @@ jQuery.extend({ handleError: function( s, xhr, status, e ) { // If a local callback was specified, fire it if ( s.error ) { - s.error.call( s.context || window, xhr, status, e ); + s.error.call( s.context || s, xhr, status, e ); } // Fire the global callback diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 582aa37..4f90126 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -95,7 +95,7 @@ test("jQuery.ajax() - abort", function() { }); test("Ajax events with context", function() { - expect(6); + expect(14); stop(); var context = document.createElement("div"); @@ -104,8 +104,16 @@ test("Ajax events with context", function() { equals( this, context, e.type ); } - function callback(){ - equals( this, context, "context is preserved on callback" ); + function callback(msg){ + return function(){ + equals( this, context, "context is preserved on callback " + msg ); + }; + } + + function nocallback(msg){ + return function(){ + equals( typeof this.url, "string", "context is settings on callback " + msg ); + }; } jQuery('#foo').add(context) @@ -116,20 +124,36 @@ test("Ajax events with context", function() { jQuery.ajax({ url: url("data/name.html"), - beforeSend: callback, - success: callback, - error: callback, + beforeSend: callback("beforeSend"), + success: callback("success"), + error: callback("error"), complete:function(){ - callback.call(this); - setTimeout(proceed, 300); + callback("complete").call(this); + + jQuery.ajax({ + url: url("data/404.html"), + context: context, + beforeSend: callback("beforeSend"), + error: callback("error"), + complete: function(){ + callback("complete").call(this); + + jQuery('#foo').add(context).unbind(); + + jQuery.ajax({ + url: url("data/404.html"), + beforeSend: nocallback("beforeSend"), + error: nocallback("error"), + complete: function(){ + nocallback("complete").call(this); + start(); + } + }); + } + }); }, context:context }); - - function proceed(){ - jQuery('#foo').add(context).unbind(); - start(); - } }); test("jQuery.ajax() - disabled globals", function() { -- 1.7.10.4