X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=44aff0fd379cad97e8fd919e5ced3c1b53d79bec;hb=ed93204e108eb90aa863fbddf8acd992b9d4a1a5;hp=3e6eb19f6d99e9bacb5048ee0f636a21b46e65f9;hpb=bbd933cbfe6d31a749cb336d7a84155ccfab247f;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 3e6eb19..44aff0f 100644
--- 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 ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+			return;
+		}
+
 		elem = elem == window ?
 			windowData :
 			elem;
@@ -43,6 +55,10 @@ jQuery.extend({
 	},
 
 	removeData: function( elem, name ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.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); });
-		}
 	}
 });
 
@@ -143,45 +125,5 @@ jQuery.fn.extend({
 		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 );
-		});
-	},
-
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
-		});
-	},
-
-	clearQueue: function(type){
-		return this.queue( type || "fx", [] );
 	}
 });