Skip to content
Permalink
Browse files

Make sure the data- number has at least one number in it before passi…

…ng to isNaN. Thanks to @cms in 8ebb9b2 for a heads-up.
  • Loading branch information...
jeresig committed Sep 22, 2010
1 parent e346394 commit 9ad7c21e701f827e108de038ff704f1e9b7022da
Showing with 6 additions and 2 deletions.
  1. +1 −1 src/data.js
  2. +5 −1 test/unit/data.js
@@ -157,7 +157,7 @@ jQuery.fn.extend({
data = data === "true" ? true :
data === "false" ? false :
data === "null" ? null :
!isNaN( data ) ? parseFloat( data ) :
/\d/.test( data ) && !isNaN( data ) ? parseFloat( data ) :
rbrace.test( data ) ? jQuery.parseJSON( data ) :
data;
} catch( e ) {}
@@ -158,7 +158,7 @@ test(".data(String) and .data(String, Object)", function() {
});

test("data-* attributes", function() {
expect(25);
expect(27);
var div = jQuery("<div>"),
child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></div>");

@@ -189,6 +189,8 @@ test("data-* attributes", function() {
.attr("data-pointbad2", "-.")
.attr("data-badjson", "{123}")
.attr("data-badjson2", "[abc]")
.attr("data-empty", "")
.attr("data-space", " ")
.attr("data-null", "null")
.attr("data-string", "test");

@@ -201,6 +203,8 @@ test("data-* attributes", function() {
strictEqual( child.data('pointbad2'), "-.", "Bad number read from attribute");
strictEqual( child.data('badjson'), "{123}", "Bad number read from attribute");
strictEqual( child.data('badjson2'), "[abc]", "Bad number read from attribute");
strictEqual( child.data('empty'), "", "Empty string read from attribute");
strictEqual( child.data('space'), " ", "Empty string read from attribute");
strictEqual( child.data('null'), null, "Primitive null read from attribute");
strictEqual( child.data('string'), "test", "Typical string read from attribute");

0 comments on commit 9ad7c21

Please sign in to comment.
You can’t perform that action at this time.