deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make empty strings (and other non-string values) simply return null from parseJSON. Also added some parseJSON tests. Fixes #5859.

Browse source
This commit is contained in:
jeresig 2010-01-23 17:08:26 -05:00
parent ea9e0ed841
commit 781fe8b80d
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/unit/core.js
View file

@ -805,3 +805,28 @@ test("jQuery.proxy", function(){
// Use the string shortcut
jQuery.proxy( thisObject, "method" )();
});
test("jQuery.parseJSON", function(){
expect(7);
equals( jQuery.parseJSON(), null, "Nothing in, null out." );
equals( jQuery.parseJSON( null ), null, "Nothing in, null out." );
equals( jQuery.parseJSON( "" ), null, "Nothing in, null out." );
same( jQuery.parseJSON("{}"), {}, "Plain object parsing." );
same( jQuery.parseJSON('{"test":1}'), {"test":1}, "Plain object parsing." );
try {
jQuery.parseJSON("{a:1}");
ok( false, "Test malformed JSON string." );
} catch( e ) {
ok( true, "Test malformed JSON string." );
}
try {
jQuery.parseJSON("{'a':1}");
ok( false, "Test malformed JSON string." );
} catch( e ) {
ok( true, "Test malformed JSON string." );
}
});