Skip to content
Permalink
Browse files
Simplified XMLHttpRequest shadow (tested on 5.5, 6 and 7); Introduced…
… preprocess callback (#384) - IE seems to fail to send the correct headers
  • Loading branch information
jzaefferer committed Dec 4, 2006
1 parent 94e59e2 commit a6ce3031871aca7c067672e91d298dd2a5bf176c
Showing with 27 additions and 5 deletions.
  1. +10 −5 src/ajax/ajax.js
  2. +17 −0 src/ajax/ajaxTest.js
@@ -134,10 +134,7 @@ jQuery.fn.extend({
// If IE is used, create a wrapper for the XMLHttpRequest object
if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
XMLHttpRequest = function(){
return new ActiveXObject(
navigator.userAgent.indexOf("MSIE 5") >= 0 ?
"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"
);
return new ActiveXObject("Microsoft.XMLHTTP");
};

// Attach a bunch of functions for handling common AJAX events
@@ -487,6 +484,9 @@ jQuery.extend({
* (Boolean) async - By default, all requests are send asynchronous (set to true).
* If you need synchronous requests, set this option to false.
*
* (Function) preprocess - A pre-callback to set custom headers etc., the
* XMLHttpRequest is passed as the only argument.
*
* @example $.ajax({
* type: "GET",
* url: "test.js",
@@ -524,7 +524,8 @@ jQuery.extend({
data: null,
contentType: "application/x-www-form-urlencoded",
processData: true,
async: true
async: true,
preprocess: null
}, s);

// if data available
@@ -565,6 +566,10 @@ jQuery.extend({
// Make sure the browser sends the right content length
if ( xml.overrideMimeType )
xml.setRequestHeader("Connection", "close");

// Allow custom headers/mimetypes
if( s.preprocess )
s.preprocess(xml);

// Wait for a response to come back
var onreadystatechange = function(isTimeout){
@@ -277,4 +277,21 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
start();
}
});
});

test("$.ajax - preprocess", function() {
expect(1);
stop();
var customHeader = "value-for-custom-header";
$.ajax({
url: "data/name.php",
data: {'req': true},
preprocess: function(xml) {
xml.setRequestHeader('customHeader', customHeader)
},
success: function(data) {
ok( data == customHeader, "check return value, should be the custom header sent" );
start();
}
});
});

0 comments on commit a6ce303

Please sign in to comment.