From: Richard Gibson <richard.gibson@gmail.com>
Date: Mon, 28 Oct 2013 15:35:53 +0000 (-0400)
Subject: Fix #14459: Use jQuery.parseJSON instead of JSON.parse
X-Git-Tag: 2.1.0-beta2~45
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ced9d155f010bc456745a55a63ca959db9d405d3;p=jquery.git

Fix #14459: Use jQuery.parseJSON instead of JSON.parse
---

diff --git a/src/data.js b/src/data.js
index 5baf1c72a..63920bb9e 100644
--- a/src/data.js
+++ b/src/data.js
@@ -36,7 +36,7 @@ function dataAttr( elem, key, data ) {
 					data === "null" ? null :
 					// Only convert to a number if it doesn't change the string
 					+data + "" === data ? +data :
-					rbrace.test( data ) ? JSON.parse( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
 					data;
 			} catch( e ) {}
 
diff --git a/test/unit/data.js b/test/unit/data.js
index e26587024..bf5629644 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -262,7 +262,6 @@ test("data-* attributes", function() {
 	var prop, i, l, metadata, elem,
 		obj, obj2, check, num, num2,
 		parseJSON = jQuery.parseJSON,
-		nativeParse = typeof JSON !== "undefined" && JSON.parse,
 		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>");
@@ -319,17 +318,11 @@ test("data-* attributes", function() {
 	equal( child.data("other"), "test", "Make sure value was pulled in properly from a .data()." );
 
 	// attribute parsing
-	i = l = 0;
+	i = 0;
 	jQuery.parseJSON = function() {
 		i++;
 		return parseJSON.apply( this, arguments );
 	};
-	if ( nativeParse ) {
-		JSON.parse = function() {
-			l++;
-			return nativeParse.apply( this, arguments );
-		};
-	}
 
 	child
 		.attr("data-true", "true")
@@ -377,12 +370,9 @@ test("data-* attributes", function() {
 	strictEqual( child.data("space"), " ", "Whitespace string read from attribute");
 	strictEqual( child.data("null"), null, "Primitive null 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" );
+	equal( i, 2, "Correct number of JSON parse attempts when reading from attributes" );
 
 	jQuery.parseJSON = parseJSON;
-	if ( nativeParse ) {
-		JSON.parse = nativeParse;
-	}
 	child.remove();
 
 	// tests from metadata plugin