X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=441a7b9bf67b21d7838a2ac9250726b9be83c329;hb=b8ceedbe2ba07f87a0f0e3862dfe012e8aa863b3;hp=2dcf87060313d70359973b1f811dc4d3f5ba13c1;hpb=35b8157507afaa28aa6e2e8efa5bb03315b33e1c;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 2dcf870..441a7b9 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -97,6 +97,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp var jsc = now(); jQuery.extend({ + get: function( url, data, callback, type ) { // shift arguments if data argument was ommited if ( jQuery.isFunction( data ) ) { @@ -112,6 +113,13 @@ 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"); @@ -273,9 +281,8 @@ jQuery.extend({ var requestDone = false; - // Create the request object; Microsoft failed to properly - // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available - var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); + // Create the request object + var xhr = jQuery.getAjaxTransport(); // Open the socket // Passing null username, generates a login popup on Opera (#2865) @@ -470,6 +477,7 @@ jQuery.extend({ throw "parsererror"; // Allow a pre-filtering function to sanitize the response + // s != null is checked to keep backwards compatibility if( s && s.dataFilter ) data = s.dataFilter( data, type );