Changeset 5281

Timestamp:

04/22/08 22:07:17 (9 months ago)

Author:

joern.zaefferer

Message:

jquery.ajax: improvement for #2688, added test

Location:

trunk/jquery

Files:

• src/ajax.js (modified) (1 diff)
• test/unit/ajax.js (modified) (1 diff)

trunk/jquery/src/ajax.js

@@ -292 +292 @@
 
         // Allow custom headers/mimetypes
-        if ( s.beforeSend )
-            var beforeSendSuccess = s.beforeSend(xml, s);
-            
-        if( beforeSendSuccess === false )
-          return false;
+        if ( s.beforeSend && s.beforeSend(xml, s) === false )
+            return false;
         
         if ( s.global )

trunk/jquery/test/unit/ajax.js

@@ -137 +137 @@
 });
 
+test("$.ajax - beforeSend, cancel request (#2688)", function() {
+    expect(2);
+    var request = $.ajax({
+        url: url("data/name.html"), 
+        beforeSend: function() {
+            ok( true, "beforeSend got called, canceling" );
+            return false;
+        },
+        success: function() {
+            ok( false, "request didn't get canceled" );
+        },
+        complete: function() {
+            ok( false, "request didn't get canceled" );
+        },
+        error: function() {
+            ok( false, "request didn't get canceled" );
+        }
+    });
+    ok( request === false, "canceled request must return false instead of XMLHttpRequest instance" );
+});
+
 var foobar;