From 9d9c4d2a516216378f4eec0bc27a2cc1cfc78d53 Mon Sep 17 00:00:00 2001 From: Ariel Flesler Date: Thu, 7 Aug 2008 13:07:21 +0000 Subject: [PATCH] jquery ajax: extends #3087. The xhr factory is now an ajax setting called 'xhr' instead of a method (jQuery.getAjaxTransport). --- src/ajax.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index 441a7b9bf..a5ee4b7cc 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -113,13 +113,6 @@ jQuery.extend({ dataType: type }); }, - - // Create the request object; Microsoft failed to properly - // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available - getAjaxTransport : function() { - return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); - }, - getScript: function( url, callback ) { return jQuery.get(url, null, callback, "script"); @@ -159,6 +152,12 @@ jQuery.extend({ data: null, username: null, password: null, + // Create the request object; Microsoft failed to properly + // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available + // This function can be overriden by calling jQuery.ajaxSetup + xhr:function(){ + return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); + }, accepts: { xml: "application/xml, text/xml", html: "text/html", @@ -282,7 +281,7 @@ jQuery.extend({ var requestDone = false; // Create the request object - var xhr = jQuery.getAjaxTransport(); + var xhr = s.xhr(); // Open the socket // Passing null username, generates a login popup on Opera (#2865)