Make sure that expando properties aren't set on embed, applet, or object elements...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 8fa62dc..44d77a9 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -6,7 +6,19 @@ jQuery.extend({
        
        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 ) {
+               if ( jQuery.noData[elem.nodeNode.toLowerCase()] ) {
+                       return;
+               }
+
                elem = elem == window ?
                        windowData :
                        elem;
@@ -43,6 +55,10 @@ jQuery.extend({
        },
 
        removeData: function( elem, name ) {
+               if ( jQuery.noData[elem.nodeNode.toLowerCase()] ) {
+                       return;
+               }
+
                elem = elem == window ?
                        windowData :
                        elem;
@@ -77,40 +93,6 @@ jQuery.extend({
                        // Completely remove the data cache
                        delete cache[ id ];
                }
-       },
-       
-       queue: function( elem, type, data ) {
-               if( !elem ) return;
-
-               type = (type || "fx") + "queue";
-               var q = jQuery.data( elem, type );
-
-               // Speed up dequeue by getting out quickly if this is just a lookup
-               if( !data ) return q || [];
-
-               if ( !q || jQuery.isArray(data) )
-                       q = jQuery.data( elem, type, jQuery.makeArray(data) );
-               else
-                       q.push( data );
-
-               return q;
-       },
-
-       dequeue: function( elem, type ){
-               type = type || "fx";
-
-               var queue = jQuery.queue( elem, type ), fn = queue.shift();
-
-               // If the fx queue is dequeued, always remove the progress sentinel
-               if( fn === "inprogress" ) fn = queue.shift();
-
-               if( fn ) {
-                       // Add a progress sentinel to prevent the fx queue from being
-                       // automatically dequeued
-                       if( type == "fx" ) queue.unshift("inprogress");
-
-                       fn.call(elem, function() { jQuery.dequeue(elem, type); });
-               }
        }
 });
 
@@ -126,45 +108,22 @@ jQuery.fn.extend({
                if ( value === undefined ) {
                        var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
 
-                       if ( data === undefined && this.length )
+                       if ( data === undefined && this.length ) {
                                data = jQuery.data( this[0], key );
-
+                       }
                        return data === undefined && parts[1] ?
                                this.data( parts[0] ) :
                                data;
-               } else
+               } else {
                        return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
                                jQuery.data( this, key, value );
                        });
+               }
        },
 
        removeData: function( key ){
                return this.each(function(){
                        jQuery.removeData( this, key );
                });
-       },
-       queue: function(type, data){
-               if ( typeof type !== "string" ) {
-                       data = type;
-                       type = "fx";
-               }
-
-               if ( data === undefined )
-                       return jQuery.queue( this[0], type );
-
-               return this.each(function(i, elem){
-                       var queue = jQuery.queue( this, type, data );
-
-                       if( type == "fx" && queue[0] !== "inprogress" )
-                               jQuery.dequeue( this, type )
-               });
-       },
-       dequeue: function(type){
-               return this.each(function(){
-                       jQuery.dequeue( this, type );
-               });
-       },
-       clearQueue: function(type){
-               return this.queue( type || "fx", [] );
        }
 });