From c3600e261ba8d9394fe505ef5a0611b6d6b18a8d Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Tue, 8 Nov 2011 13:12:37 -0500
Subject: [PATCH] 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.
---
 src/ajax.js       | 4 ++--
 test/unit/ajax.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index bf81d3a73f..fb5f08c1d1 100644
--- 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 c89224c2e4..9527beea10 100644
--- 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();
 		}
 	});