avoid creating a new data cache if we don't need one. Also, short-circuit the case...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 9cc76c6..c18e73c 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,31 +1,38 @@
 var expando = "jQuery" + now(), uuid = 0, windowData = {};\r
+var emptyObject = {};\r
 \r
 jQuery.extend({\r
        cache: {},\r
+       \r
+       expando:expando,\r
 \r
        data: function( elem, name, data ) {\r
                elem = elem == window ?\r
                        windowData :\r
                        elem;\r
 \r
-               var id = elem[ expando ], cache = jQuery.cache;\r
+               var id = elem[ expando ], cache = jQuery.cache, thisCache;\r
 \r
                // Compute a unique ID for the element\r
                if(!id) id = elem[ expando ] = ++uuid;\r
 \r
-               // Only generate the data cache if we're\r
-               // trying to access or manipulate it\r
-               if ( name && !cache[ id ] )\r
-                       cache[ id ] = {};\r
-\r
-               var thisCache = cache[ id ];\r
-\r
+               // Handle the case where there's no name immediately\r
+               if ( !name ) { return id; }\r
+\r
+               // Avoid generating a new cache unless none exists and we\r
+               // want to manipulate it.\r
+               if( cache[ id ] )\r
+                       thisCache = cache[ id ];\r
+               else if( typeof data === "undefined" )\r
+                       thisCache = emptyObject;\r
+               else\r
+                       thisCache = cache[ id ] = {};\r
+               \r
                // Prevent overriding the named cache with undefined values\r
                if ( data !== undefined ) thisCache[ name ] = data;\r
 \r
-               if(name === true) return thisCache\r
-               else if(name) return thisCache[name]\r
-               else return id\r
+               if(name === true) return thisCache;\r
+               else return thisCache[name];\r
        },\r
 \r
        removeData: function( elem, name ) {\r
@@ -63,30 +70,37 @@ jQuery.extend({
                }\r
        },\r
        queue: function( elem, type, data ) {\r
-               if ( elem ){\r
+               if( !elem ) return;\r
 \r
-                       type = (type || "fx") + "queue";\r
+               type = (type || "fx") + "queue";\r
+               var q = jQuery.data( elem, type );\r
 \r
-                       var q = jQuery.data( elem, type );\r
+               // Speed up dequeue by getting out quickly if this is just a lookup\r
+               if( !data ) return q || [];\r
 \r
-                       if ( !q || jQuery.isArray(data) )\r
-                               q = jQuery.data( elem, type, jQuery.makeArray(data) );\r
-                       else if( data )\r
-                               q.push( data );\r
+               if ( !q || jQuery.isArray(data) )\r
+                       q = jQuery.data( elem, type, jQuery.makeArray(data) );\r
+               else\r
+                       q.push( data );\r
 \r
-               }\r
                return q;\r
        },\r
 \r
        dequeue: function( elem, type ){\r
-               var queue = jQuery.queue( elem, type ),\r
-                       fn = queue.shift();\r
+               type = type || "fx";\r
 \r
-               if( !type || type === "fx" )\r
-                       fn = queue[0];\r
+               var queue = jQuery.queue( elem, type ), fn = queue.shift();\r
 \r
-               if( fn !== undefined )\r
-                       fn.call(elem, function() { jQuery(elem).dequeue(type); });\r
+               // If the fx queue is dequeued, always remove the progress sentinel\r
+               if( fn === "inprogress" ) fn = queue.shift();\r
+\r
+               if( fn ) {\r
+                       // Add a progress sentinel to prevent the fx queue from being\r
+                       // automatically dequeued\r
+                       if( type == "fx" ) queue.unshift("inprogress");\r
+\r
+                       fn.call(elem, function() { jQuery.dequeue(elem, type); });\r
+               }\r
        }\r
 });\r
 \r
@@ -129,8 +143,8 @@ jQuery.fn.extend({
                return this.each(function(i, elem){\r
                        var queue = jQuery.queue( this, type, data );\r
 \r
-                       if( type == "fx" && queue.length == 1 )\r
-                               queue[0].call(this, function() { jQuery(elem).dequeue(type); });\r
+                       if( type == "fx" && queue[0] !== "inprogress" )\r
+                               jQuery.dequeue( this, type )\r
                });\r
        },\r
        dequeue: function(type){\r