From 65e909844c2d064606217b47e92eff12ebdb79de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
 <m.goleb@gmail.com>
Date: Mon, 20 Apr 2020 18:11:18 +0200
Subject: [PATCH] Data: Make the data object a regular object again

The change in gh-4603 made the object returned by `elem.data()`
a prototype-less object. That's a desired change to support keys
colliding with `Object.prototype` properties but it's also a breaking
change so it has to wait for jQuery 4.0.0.

A 3.x-only test was added to avoid breaking it in the future on this
branch.

Fixes gh-4665
Ref gh-4603
Closes gh-4666
---
 src/data/Data.js  |  2 +-
 test/unit/data.js | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/data/Data.js b/src/data/Data.js
index ce6d8fa9b..31ff4318c 100644
--- a/src/data/Data.js
+++ b/src/data/Data.js
@@ -22,7 +22,7 @@ Data.prototype = {
 
 		// If not, create one
 		if ( !value ) {
-			value = Object.create( null );
+			value = {};
 
 			// We can accept data for non-element nodes in modern browsers,
 			// but we should not, see #8335.
diff --git a/test/unit/data.js b/test/unit/data.js
index 55879415f..3a2047cff 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -990,17 +990,20 @@ QUnit.test( ".data(prop) does not create expando", function( assert ) {
 	}
 } );
 
-QUnit.test( "keys matching Object.prototype properties  (gh-3256)", function( assert ) {
-	assert.expect( 2 );
+QUnit.test( ".data() returns a regular object (jQuery <4 only, gh-4665)", function( assert ) {
+	assert.expect( 4 );
 
-	var div = jQuery( "<div></div>" );
+	function verifyRegularObject( assert, object ) {
+		assert.strictEqual( object.hasOwnProperty, Object.prototype.hasOwnProperty,
+			"Data object has the hasOwnProperty method" );
+		assert.strictEqual( object + "", "[object Object]",
+			"Data object can be stringified" );
+	}
 
-	assert.strictEqual( div.data( "hasOwnProperty" ), undefined,
-		"hasOwnProperty not matched (before forced data creation)" );
+	var elem = jQuery( "<div></div>" );
 
-	// Force the creation of a data object for this element.
-	div.data( { foo: "bar" } );
+	verifyRegularObject( assert, elem.data() );
 
-	assert.strictEqual( div.data( "hasOwnProperty" ), undefined,
-		"hasOwnProperty not matched (after forced data creation)" );
+	elem.data( "foo", "bar" );
+	verifyRegularObject( assert, elem.data() );
 } );