deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that expando properties aren't set on embed, applet, or object elements. An uncatchable exception is thrown and we must avoid it. Fixes #1675 and #2349.

Browse source
This commit is contained in:
John Resig 2009-12-06 20:00:31 -08:00
parent 7d36ccfa8e
commit 5980292856
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/data.js
View file

@ -6,7 +6,19 @@ jQuery.extend({
expando:expando, expando:expando,
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
noData: {
"embed": true,
"object": true,
"applet": true
},
data: function( elem, name, data ) { data: function( elem, name, data ) {
if ( jQuery.noData[elem.nodeNode.toLowerCase()] ) {
return;
}
elem = elem == window ? elem = elem == window ?
windowData : windowData :
elem; elem;
@ -43,6 +55,10 @@ jQuery.extend({
}, },
removeData: function( elem, name ) { removeData: function( elem, name ) {
if ( jQuery.noData[elem.nodeNode.toLowerCase()] ) {
return;
}
elem = elem == window ? elem = elem == window ?
windowData : windowData :
elem; elem;

2
src/manipulation.js
View file

@ -463,7 +463,7 @@ jQuery.extend({
function cleanData( elems ) { function cleanData( elems ) {
for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) { for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
if ( (id = elem[expando]) ) { if ( !jQuery.noData[elem.nodeNode.toLowerCase()] && (id = elem[expando]) ) {
delete jQuery.cache[ id ]; delete jQuery.cache[ id ];
} }
} }