Skip to content
Permalink
Browse files
Fix #14074: element id="nodeName". Close gh-1389.
  • Loading branch information
gibson042 committed Nov 7, 2013
1 parent d0b8f9f commit 126d596b56924613687329b7aab4f0cdf4b593b3
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 22 deletions.
@@ -238,13 +238,13 @@ function internalRemoveData( elem, name, pvt ) {
jQuery.extend({
cache: {},

// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
// The following elements (space-suffixed to avoid Object.prototype collisions)
// throw uncatchable exceptions if you attempt to set expando properties
noData: {
"applet": true,
"embed": true,
// Ban all objects except for Flash (which handle expandos)
"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
"applet ": true,
"embed ": true,
// ...but Flash objects (which have this classid) *can* handle expandos
"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
},

hasData: function( elem ) {
@@ -6,15 +6,15 @@ define([
* Determines whether an object can have data
*/
jQuery.acceptData = function( elem ) {
// Do not set data on non-element because it will not be cleared (#8335).
if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
return false;
}
var noData = jQuery.noData[ (elem.nodeName + " ").toLowerCase() ],
nodeType = +elem.nodeType || 1;

var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
return nodeType !== 1 && nodeType !== 9 ?
false :

// nodes accept data unless otherwise specified; rejection can be conditional
return !noData || noData !== true && elem.getAttribute("classid") === noData;
// Nodes accept data unless otherwise specified; rejection can be conditional
!noData || noData !== true && elem.getAttribute("classid") === noData;
};

return jQuery.acceptData;
@@ -0,0 +1,24 @@
<!doctype html>
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
<title>alias-masked DOM properties (#14074)</title>
<script>
var errors = [];
window.onerror = function( errorMessage, filePath, lineNumber ) {
errors.push( errorMessage );
};
</script>
<script src="../../jquery.js"></script>
</head>
<body>
<form>
<input type="text" id="nodeName"/>
</form>
<script>
jQuery(function() {
window.parent.iframeCallback( errors );
});
</script>
</body>
</html>
@@ -1419,3 +1419,10 @@ testIframeWithCallback( "Conditional compilation compatibility (#13274)", "core/
deepEqual( errors, [], "No errors" );
ok( $(), "jQuery executes" );
});

testIframeWithCallback( "Tolerating alias-masked DOM properties (#14074)", "core/aliased.html",
function( errors ) {
expect( 1 );
deepEqual( errors, [], "jQuery loaded" );
}
);
@@ -142,26 +142,30 @@ test("Data is not being set on comment and text nodes", function() {
});

test("jQuery.acceptData", function() {
expect(9);
expect( 10 );

var flash, applet;

ok( jQuery.acceptData( document ), "document" );
ok( jQuery.acceptData( document.documentElement ), "documentElement" );
ok( jQuery.acceptData( {} ), "object" );
ok( !jQuery.acceptData( document.createElement("embed") ), "embed" );
ok( !jQuery.acceptData( document.createElement("applet") ), "applet" );
ok( !jQuery.acceptData( document.createElement( "embed" ) ), "embed" );
ok( !jQuery.acceptData( document.createElement( "applet" ) ), "applet" );

flash = document.createElement("object");
flash.setAttribute("classid", "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000");
flash = document.createElement( "object" );
flash.setAttribute( "classid", "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" );
ok( jQuery.acceptData( flash ), "flash" );

applet = document.createElement("object");
applet.setAttribute("classid", "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93");
applet = document.createElement( "object" );
applet.setAttribute( "classid", "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" );
ok( !jQuery.acceptData( applet ), "applet" );

ok( !jQuery.acceptData( document.createComment("") ), "comment" );
ok( !jQuery.acceptData( document.createTextNode("") ), "text" );
ok( !jQuery.acceptData( document.createComment( "" ) ), "comment" );
ok( !jQuery.acceptData( document.createTextNode( "" ) ), "text" );

ok( jQuery.acceptData(
jQuery( "#form" ).append( "<input id='nodeType'/><input id='nodeName'/>" )[ 0 ] ),
"form with aliased DOM properties" );
});

// attempting to access the data of an undefined jQuery element should be undefined

0 comments on commit 126d596

Please sign in to comment.