Merge branch 'setterargs'

diff --git a/src/ajax.js b/src/ajax.js
index 9501e8a..73e1db6 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",
@@ -571,20 +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" || !type && ct.indexOf("javascript") >= 0 ) {
-                               jQuery.globalEval( data );
-                       }
-
                        // Get the JavaScript object, if JSON is used.
                        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.parse";
                                }
+
+                       // If the type is "script", eval it in global context
+                       } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+                               jQuery.globalEval( data );
                        }
                }
 

diff --git a/test/data/badjson.js b/test/data/badjson.js
new file mode 100644 (file)
index 0000000..ec41ee5
--- /dev/null
+++ b/test/data/badjson.js
@@ -0,0 +1 @@
+{bad: 1}

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 3393780..298fb5b 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -341,13 +341,13 @@ test("jQuery.param()", function() {
 
 test("synchronous request", function() {
        expect(1);
-       ok( /^{ "data"/.test( jQuery.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
+       ok( /^{ "data"/.test( jQuery.ajax({url: url("data/json_obj.js"), dataType: "text", async: false}).responseText ), "check returned text" );
 });
 
 test("synchronous request with callbacks", function() {
        expect(2);
        var result;
-       jQuery.ajax({url: url("data/json_obj.js"), async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
+       jQuery.ajax({url: url("data/json_obj.js"), async: false, dataType: "text", success: function(data) { ok(true, "sucess callback executed"); result = data; } });
        ok( /^{ "data"/.test( result ), "check returned text" );
 });
 
@@ -821,6 +821,25 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
        });
 });
 
+test("jQuery.ajax() - malformed JSON", function() {
+       expect(1);
+
+       stop();
+
+       jQuery.ajax({
+               url: "data/badjson.js",
+               dataType: "json",
+               success: function(){
+                       ok( false, "Success." );
+                       start();
+               },
+               error: function(xhr, msg) {
+                       equals( "parsererror", msg, "A parse error occurred." );
+                       start();
+               }
+       });
+});
+
 test("jQuery.ajax() - script by content-type", function() {
        expect(1);