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

Ref 2263134b: Better identify potential JSON. Close gh-1401.

Browse Source 
(cherry picked from commit 083edd60a6)

Conflicts:

	src/data.js
This commit is contained in:
Ronny Springer 2013-10-11 10:09:54 +02:00 committed by Richard Gibson
parent 08b6271b6d
commit aa70819598
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data.js
View File

@ -5,7 +5,7 @@ define([
"./data/accepts" "./data/accepts"
], function( jQuery, deletedIds, support ) { ], function( jQuery, deletedIds, support ) {
var rbrace = /(?:\{[\w\W]*\}|\[[\w\W]*\])$/, var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
rmultiDash = /([A-Z])/g; rmultiDash = /([A-Z])/g;
function dataAttr( elem, key, data ) { function dataAttr( elem, key, data ) {

57
test/unit/data.js
View File

@ -239,9 +239,12 @@ test("jQuery(plain Object).data(String, Object).data(String)", function() {
}); });
test("data-* attributes", function() { test("data-* attributes", function() {
expect(40); expect( 43 );
var prop, i, l, metadata, elem, var prop, i, l, metadata, elem,
obj, obj2, check, num, num2, obj, obj2, check, num, num2,
parseJSON = jQuery.parseJSON,
nativeParse = typeof JSON !== "undefined" && JSON.parse,
div = jQuery("<div>"), 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>");
@ -297,6 +300,19 @@ test("data-* attributes", function() {
equal( child.data("other"), "test", "Make sure value was pulled in properly from a .data()." ); equal( child.data("other"), "test", "Make sure value was pulled in properly from a .data()." );
// attribute parsing
i = l = 0;
jQuery.parseJSON = function() {
i++;
return parseJSON.apply( this, arguments );
};
if ( nativeParse ) {
JSON.parse = function() {
l++;
return nativeParse.apply( this, arguments );
};
}
child child
.attr("data-true", "true") .attr("data-true", "true")
.attr("data-false", "false") .attr("data-false", "false")
@ -310,6 +326,8 @@ test("data-* attributes", function() {
.attr("data-bigassnum", "123456789123456789123456789") .attr("data-bigassnum", "123456789123456789123456789")
.attr("data-badjson", "{123}") .attr("data-badjson", "{123}")
.attr("data-badjson2", "[abc]") .attr("data-badjson2", "[abc]")
.attr("data-notjson", " {}")
.attr("data-notjson2", "[] ")
.attr("data-empty", "") .attr("data-empty", "")
.attr("data-space", " ") .attr("data-space", " ")
.attr("data-null", "null") .attr("data-null", "null")
@ -317,21 +335,36 @@ test("data-* attributes", function() {
strictEqual( child.data("true"), true, "Primitive true read from attribute"); strictEqual( child.data("true"), true, "Primitive true read from attribute");
strictEqual( child.data("false"), false, "Primitive false read from attribute"); strictEqual( child.data("false"), false, "Primitive false read from attribute");
strictEqual( child.data("five"), 5, "Primitive number read from attribute"); strictEqual( child.data("five"), 5, "Integer read from attribute");
strictEqual( child.data("point"), 5.5, "Primitive number read from attribute"); strictEqual( child.data("point"), 5.5, "Floating-point number read from attribute");
strictEqual( child.data("pointe"), "5.5E3", "Floating point exponential number read from attribute"); strictEqual( child.data("pointe"), "5.5E3",
strictEqual( child.data("grande"), "5.574E9", "Big exponential number read from attribute"); "Exponential-notation number read from attribute as string");
strictEqual( child.data("hexadecimal"), "0x42", "Hexadecimal number read from attribute"); strictEqual( child.data("grande"), "5.574E9",
strictEqual( child.data("pointbad"), "5..5", "Bad number read from attribute"); "Big exponential-notation number read from attribute as string");
strictEqual( child.data("pointbad2"), "-.", "Bad number read from attribute"); strictEqual( child.data("hexadecimal"), "0x42",
strictEqual( child.data("bigassnum"), "123456789123456789123456789", "Bad bigass number read from attribute"); "Hexadecimal number read from attribute as string");
strictEqual( child.data("badjson"), "{123}", "Bad number read from attribute"); strictEqual( child.data("pointbad"), "5..5",
strictEqual( child.data("badjson2"), "[abc]", "Bad number read from attribute"); "Extra-point non-number read from attribute as string");
strictEqual( child.data("pointbad2"), "-.",
"No-digit non-number read from attribute as string");
strictEqual( child.data("bigassnum"), "123456789123456789123456789",
"Bad bigass number read from attribute as string");
strictEqual( child.data("badjson"), "{123}", "Bad JSON object read from attribute as string");
strictEqual( child.data("badjson2"), "[abc]", "Bad JSON array read from attribute as string");
strictEqual( child.data("notjson"), " {}",
"JSON object with leading non-JSON read from attribute as string");
strictEqual( child.data("notjson2"), "[] ",
"JSON array with trailing non-JSON read from attribute as string");
strictEqual( child.data("empty"), "", "Empty string read from attribute"); strictEqual( child.data("empty"), "", "Empty string read from attribute");
strictEqual( child.data("space"), " ", "Empty string read from attribute"); strictEqual( child.data("space"), " ", "Whitespace string read from attribute");
strictEqual( child.data("null"), null, "Primitive null read from attribute"); strictEqual( child.data("null"), null, "Primitive null read from attribute");
strictEqual( child.data("string"), "test", "Typical string read from attribute"); strictEqual( child.data("string"), "test", "Typical string read from attribute");
equal( i || l, 2, "Correct number of JSON parse attempts when reading from attributes" );
jQuery.parseJSON = parseJSON;
if ( nativeParse ) {
JSON.parse = nativeParse;
}
child.remove(); child.remove();
// tests from metadata plugin // tests from metadata plugin