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 1 Packages Projects Releases Wiki Activity

Fix #11309. Recognize hexadecimal in data attributes.

Browse Source
This commit is contained in:
Sindre Sorhus 2012-02-09 20:25:43 -05:00 committed by Dave Methvin
parent 974e4afbe2
commit 96bb57d4ef
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data.js
View File

@ -333,7 +333,7 @@ function dataAttr( elem, key, data ) {
data = data === "true" ? true : data = data === "true" ? true :
data === "false" ? false : data === "false" ? false :
data === "null" ? null : data === "null" ? null :
jQuery.isNumeric( data ) ? parseFloat( data ) : jQuery.isNumeric( data ) ? +data :
rbrace.test( data ) ? jQuery.parseJSON( data ) : rbrace.test( data ) ? jQuery.parseJSON( data ) :
data; data;
} catch( e ) {} } catch( e ) {}

4
test/unit/data.js
View File

@ -298,7 +298,7 @@ test(".data(String) and .data(String, Object)", function() {
}); });
test("data-* attributes", function() { test("data-* attributes", function() {
expect(37); expect(38);
var div = jQuery("<div>"), var div = jQuery("<div>"),
child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></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>"); dummy = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>");
@ -356,6 +356,7 @@ test("data-* attributes", function() {
.attr("data-five", "5") .attr("data-five", "5")
.attr("data-point", "5.5") .attr("data-point", "5.5")
.attr("data-pointe", "5.5E3") .attr("data-pointe", "5.5E3")
.attr("data-hexadecimal", "0x42")
.attr("data-pointbad", "5..5") .attr("data-pointbad", "5..5")
.attr("data-pointbad2", "-.") .attr("data-pointbad2", "-.")
.attr("data-badjson", "{123}") .attr("data-badjson", "{123}")
@ -370,6 +371,7 @@ test("data-* attributes", function() {
strictEqual( child.data("five"), 5, "Primitive number 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("point"), 5.5, "Primitive number read from attribute");
strictEqual( child.data("pointe"), 5500, "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("pointbad"), "5..5", "Bad 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("pointbad2"), "-.", "Bad number read from attribute");
strictEqual( child.data("badjson"), "{123}", "Bad number read from attribute"); strictEqual( child.data("badjson"), "{123}", "Bad number read from attribute");