Make sure that a parsererror is thrown whenever malformed JSON comes back from a...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 91519d2..4ba4548 100644 (file)
--- 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",
@@ -555,8 +554,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" ) {
@@ -571,21 +570,26 @@ 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 ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
                                // Try to use the native JSON parser first
-                               try {
-                                       data = JSON.parse( data );
+                               if ( window.JSON && window.JSON.parse ) {
+                                       data = window.JSON.parse( data );
+
+                               // Make sure the incoming data is actual JSON
+                               // Logic borrowed from http://json.org/json2.js
+                               } else 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, ""))) {
+                                               data = (new Function("return " + data))();
 
-                               } catch(e) {
-                                       data = (new Function("return " + data))();
+                               } else {
+                                       throw "JSON Syntax Error: " + data;
                                }
+
+                       // If the type is "script", eval it in global context
+                       } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+                               jQuery.globalEval( data );
                        }
                }