X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=83e5bdcaff2e10177596c58ff451b1ae4e79e476;hb=857d8afd6917775b7cef6fd22e57dd9acec77f01;hp=182a88e5a7f6572dfcba7431971d208736c0ec02;hpb=b2289f3ec174c5b22d130d8c36a5e07daa6d02df;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 182a88e..83e5bdc 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -178,11 +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() {
-			return window.XMLHttpRequest && window.location.protocol !== "file:" || window.ActiveXObject ?
-				new window.XMLHttpRequest() :
-				new window.ActiveXObject("Microsoft.XMLHTTP");
-		},
+		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
+			function() {
+				return new window.XMLHttpRequest();
+			} :
+			function() {
+				try {
+					return new window.ActiveXObject("Microsoft.XMLHTTP");
+				} catch(e) {}
+			},
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -326,6 +330,10 @@ jQuery.extend({
 		// Create the request object
 		var xhr = s.xhr();
 
+		if ( !xhr ) {
+			return;
+		}
+
 		// Open the socket
 		// Passing null username, generates a login popup on Opera (#2865)
 		if ( s.username ) {
@@ -382,14 +390,17 @@ jQuery.extend({
 
 		// Wait for a response to come back
 		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted, clear the interval and decrement jQuery.active
+			// The request was aborted
 			if ( !xhr || xhr.readyState === 0 ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
+				// Opera doesn't call onreadystatechange before this point
+				// so we simulate the call
+				if ( !requestDone ) {
+					complete();
+				}
 
-				// Handle the global AJAX counter
-				if ( s.global && ! --jQuery.active ) {
-					jQuery.event.trigger( "ajaxStop" );
+				requestDone = true;
+				if ( xhr ) {
+					xhr.onreadystatechange = jQuery.noop;
 				}
 
 			// The transfer is complete and the data is available, or the request timed out
@@ -439,6 +450,21 @@ jQuery.extend({
 			}
 		};
 
+		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+		// Opera doesn't fire onreadystatechange at all on abort
+		try {
+			var oldAbort = xhr.abort;
+			xhr.abort = function() {
+				oldAbort.call( xhr );
+
+				if ( xhr ) {
+					xhr.readyState = 0;
+				}
+
+				onreadystatechange();
+			};
+		} catch(e) { }
+
 		// Timeout checker
 		if ( s.async && s.timeout > 0 ) {
 			setTimeout(function() {
@@ -546,8 +572,8 @@ jQuery.extend({
 	},
 
 	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type"),
-			xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0,
+		var ct = xhr.getResponseHeader("content-type") || "",
+			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
 			data = xml ? xhr.responseXML : xhr.responseText;
 
 		if ( xml && data.documentElement.nodeName === "parsererror" ) {
@@ -562,19 +588,29 @@ jQuery.extend({
 
 		// The filter can actually parse the response
 		if ( typeof data === "string" ) {
-
-			// If the type is "script", eval it in global context
-			if ( type === "script" ) {
-				jQuery.globalEval( data );
-			}
-
 			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" ) {
-				if ( typeof JSON === "object" && JSON.parse ) {
-					data = JSON.parse( data );
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				// Make sure the incoming data is actual JSON
+				// Logic borrowed from http://json.org/json2.js
+				if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+					.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+					.replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+
+					// Try to use the native JSON parser first
+					if ( window.JSON && window.JSON.parse ) {
+						data = window.JSON.parse( data );
+
+					} else {
+						data = (new Function("return " + data))();
+					}
+
 				} else {
-					data = (new Function("return " + data))();
+					throw "Invalid JSON: " + data;
 				}
+
+			// If the type is "script", eval it in global context
+			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+				jQuery.globalEval( data );
 			}
 		}