library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 586fb05919.
This commit is contained in:
Dave Methvin 2011-11-08 13:12:37 -05:00
parent d8e2b4b6e4
commit c3600e261b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ajax.js
View File

@ -752,10 +752,10 @@ jQuery.extend({
} catch (e) { } catch (e) {
// Propagate exception as error if not done // Propagate exception as error if not done
if ( state < 2 ) { if ( state < 2 ) {
done( -1, e.message ); done( -1, e );
// Simply rethrow otherwise // Simply rethrow otherwise
} else { } else {
jQuery.error( e.message ); throw e;
} }
} }
} }

2
test/unit/ajax.js
View File

@ -1616,7 +1616,7 @@ test("jQuery.ajax() - malformed JSON", function() {
}, },
error: function(xhr, msg, detailedMsg) { error: function(xhr, msg, detailedMsg) {
equal( "parsererror", msg, "A parse error occurred." ); 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(); start();
} }
}); });