From c68fbc2071f67876edbb3fca202362aecb82ca9c Mon Sep 17 00:00:00 2001 From: jeresig Date: Thu, 7 Jan 2010 10:00:55 -0500 Subject: [PATCH] There's enough logic going on in jQuery.ajaxSettings.xhr to warrant splitting the function based upon the functionality. --- src/ajax.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index 9501e8a0..35d83e4f 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -178,16 +178,15 @@ jQuery.extend({ // implement the XMLHttpRequest in IE7 (can't request local files), // so we use the ActiveXObject when it is available // This function can be overriden by calling jQuery.ajaxSetup - xhr: function() { - if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) { + xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ? + function() { return new window.XMLHttpRequest(); - - } else { + } : + function() { try { return new window.ActiveXObject("Microsoft.XMLHTTP"); } catch(e) {} - } - }, + }, accepts: { xml: "application/xml, text/xml", html: "text/html",