Take 2 on "Fix ajax to always expect an Error object, per #10646."

We can't use jQuery.error to rethrow anymore since it constructs a new Error from its supposedly-string arg. Also, older IE stringifies Error objects into "[object Error]" so I've loosened the unit test criteria.

This reverts commit 586fb059190ecacd89e3cd211c78e776792d2f2b.

diff --git a/src/ajax.js b/src/ajax.js
index bf81d3a73f9f8436fd94ca8beeaa46b67bad4200..fb5f08c1d12123d8e6acad9e20135255ca52bdf7 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -752,10 +752,10 @@ jQuery.extend({
                        } catch (e) {
                                // Propagate exception as error if not done
                                if ( state < 2 ) {
-                                       done( -1, e.message );
+                                       done( -1, e );
                                // Simply rethrow otherwise
                                } else {
-                                       jQuery.error( e.message );
+                                       throw e;
                                }
                        }
                }

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c89224c2e4fddb27a1e2ea601f9e79a9eb4ce072..9527beea10f1d0a4438fd5a7f257f5bdc82bc8ec 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1616,7 +1616,7 @@ test("jQuery.ajax() - malformed JSON", function() {
                },
                error: function(xhr, msg, detailedMsg) {
                        equal( "parsererror", msg, "A parse error occurred." );
-                       ok( /^(Invalid|SyntaxError|exception)/i.test(detailedMsg), "Detailed parsererror message provided" );
+                       ok( /(invalid|error|exception)/i.test(detailedMsg), "Detailed parsererror message provided" );
                        start();
                }
        });