Permalink
Browse files

Fix #7579. Don't convert to number if it changes the string. Close gh…

…-852.

Net effect here is that hex numbers and most exponential-format numbers or long sequences of digits will remain strings rather than being coerced to numbers. `The people have spoken.
  • Loading branch information...
1 parent da4d609 commit ce15bd7d0c14106521bd21179b1507f2863d1960 @dmethvin dmethvin committed Jul 25, 2012
Showing with 10 additions and 5 deletions.
  1. +3 −2 src/data.js
  2. +7 −3 test/unit/data.js
View
@@ -304,8 +304,9 @@ function dataAttr( elem, key, data ) {
data = data === "true" ? true :
data === "false" ? false :
data === "null" ? null :
- jQuery.isNumeric( data ) ? +data :
- rbrace.test( data ) ? jQuery.parseJSON( data ) :
+ // Only convert to a number if it doesn't change the string
+ +data + "" === data ? +data :
+ rbrace.test( data ) ? jQuery.parseJSON( data ) :
data;
} catch( e ) {}
View
@@ -294,7 +294,7 @@ test(".data(String) and .data(String, Object)", function() {
});
test("data-* attributes", function() {
- expect(38);
+ expect(40);
var div = jQuery("<div>"),
child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>"),
dummy = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>");
@@ -357,9 +357,11 @@ test("data-* attributes", function() {
.attr("data-five", "5")
.attr("data-point", "5.5")
.attr("data-pointe", "5.5E3")
+ .attr("data-grande", "5.574E9")
.attr("data-hexadecimal", "0x42")
.attr("data-pointbad", "5..5")
.attr("data-pointbad2", "-.")
+ .attr("data-bigassnum", "123456789123456789123456789")
.attr("data-badjson", "{123}")
.attr("data-badjson2", "[abc]")
.attr("data-empty", "")
@@ -371,10 +373,12 @@ test("data-* attributes", function() {
strictEqual( child.data("false"), false, "Primitive false read from attribute");
strictEqual( child.data("five"), 5, "Primitive number read from attribute");
strictEqual( child.data("point"), 5.5, "Primitive number read from attribute");
- strictEqual( child.data("pointe"), 5500, "Primitive number read from attribute");
- strictEqual( child.data("hexadecimal"), 66, "Hexadecimal number read from attribute");
+ strictEqual( child.data("pointe"), "5.5E3", "Floating point exponential number read from attribute");
+ strictEqual( child.data("grande"), "5.574E9", "Big exponential number read from attribute");
+ strictEqual( child.data("hexadecimal"), "0x42", "Hexadecimal number read from attribute");
strictEqual( child.data("pointbad"), "5..5", "Bad number read from attribute");
strictEqual( child.data("pointbad2"), "-.", "Bad number read from attribute");
+ strictEqual( child.data("bigassnum"), "123456789123456789123456789", "Bad bigass 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");

0 comments on commit ce15bd7

Please sign in to comment.