From 6805fc2cd20e36af5c1b0c51f6f39f21cea4609a Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Mon, 22 Aug 2011 13:49:18 -0400
Subject: [PATCH] Landing pull request 461. Adds a due diligence check for
 pre-defined data-* attrs during removal. Fixes #10026.

More Details:
 - https://github.com/jquery/jquery/pull/461
 - http://bugs.jquery.com/ticket/10026
---
 src/data.js       |  5 +++++
 test/unit/data.js | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/data.js b/src/data.js
index 4f87a3550..763b3df12 100644
--- a/src/data.js
+++ b/src/data.js
@@ -167,6 +167,11 @@ jQuery.extend({
 
 				delete thisCache[ name ];
 
+				// Check the actual element for predefined data-* attrs, #10027
+				if ( jQuery.attr( elem, "data-" + name ) ) {
+					jQuery.removeAttr( elem, "data-" + name );
+				}
+
 				// If there is no data left in the cache, we want to continue
 				// and let the cache object itself get destroyed
 				if ( !isEmptyDataObject(thisCache) ) {
diff --git a/test/unit/data.js b/test/unit/data.js
index 4e21f563e..37d29bc20 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -568,7 +568,7 @@ test("jQuery.data supports interoperable removal of hyphenated/camelCase propert
 			"some-json": '{ "foo": "bar" }'
 		};
 
-	expect( 27 );
+	expect( 29 );
 
 	jQuery.each( datas, function( key, val ) {
 		div.data( key, val );
@@ -581,4 +581,15 @@ test("jQuery.data supports interoperable removal of hyphenated/camelCase propert
 		equal( div.data( key ), undefined, "get: " + key );
 
 	});
+
+	div.remove();
+
+	// Covers #10027
+	div = jQuery("<div data-msg='hello'></div>");
+
+	equal( div.data("msg"), "hello", "<div data-msg='hello'></div> has expected data" );
+
+	div.removeData("msg");
+
+	equal( div.data("msg"), undefined, "data-msg removed correctly" );
 });
-- 
2.39.5