X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=441a7b9bf67b21d7838a2ac9250726b9be83c329;hb=b8ceedbe2ba07f87a0f0e3862dfe012e8aa863b3;hp=42d0b280ca41478cc7f2f81acba382d69a2a50f4;hpb=335b8816c2f1e66de1fa245278794f8c7fdb1e01;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 42d0b28..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,7 +477,8 @@ jQuery.extend({
 			throw "parsererror";
 			
 		// Allow a pre-filtering function to sanitize the response
-		if( s.dataFilter )
+		// s != null is checked to keep backwards compatibility
+		if( s && s.dataFilter )
 			data = s.dataFilter( data, type );
 
 		// If the type is "script", eval it in global context