git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented .data() to get the entire data object. Closes #4284
[jquery.git]
/
src
/
data.js
diff --git
a/src/data.js
b/src/data.js
index
8c79c21
..
1d5fe89
100644
(file)
--- a/
src/data.js
+++ b/
src/data.js
@@
-23,6
+23,8
@@
jQuery.extend({
if ( data !== undefined )
\r
jQuery.cache[ id ][ name ] = data;
\r
\r
if ( data !== undefined )
\r
jQuery.cache[ id ][ name ] = data;
\r
\r
+ if(name === true) return jQuery.cache[ id ]
\r
+
\r
// Return the named cache data, or the ID for the element
\r
return name ?
\r
jQuery.cache[ id ][ name ] :
\r
// Return the named cache data, or the ID for the element
\r
return name ?
\r
jQuery.cache[ id ][ name ] :
\r
@@
-93,11
+95,13
@@
jQuery.extend({
\r
if( fn !== undefined )
\r
fn.call(elem, function() { jQuery(elem).dequeue(type); });
\r
\r
if( fn !== undefined )
\r
fn.call(elem, function() { jQuery(elem).dequeue(type); });
\r
- },
\r
+ }
\r
});
\r
\r
jQuery.fn.extend({
\r
data: function( key, value ){
\r
});
\r
\r
jQuery.fn.extend({
\r
data: function( key, value ){
\r
+ if(typeof key === "undefined" && this.length) return jQuery.data(this[0], true);
\r
+
\r
var parts = key.split(".");
\r
parts[1] = parts[1] ? "." + parts[1] : "";
\r
\r
var parts = key.split(".");
\r
parts[1] = parts[1] ? "." + parts[1] : "";
\r
\r
@@
-130,11
+134,11
@@
jQuery.fn.extend({
if ( data === undefined )
\r
return jQuery.queue( this[0], type );
\r
\r
if ( data === undefined )
\r
return jQuery.queue( this[0], type );
\r
\r
- return this.each(function(){
\r
+ return this.each(function(i, elem){
\r
var queue = jQuery.queue( this, type, data );
\r
\r
var queue = jQuery.queue( this, type, data );
\r
\r
- if( type == "fx" && queue.length == 1 )
\r
- queue[0].call(this);
\r
+ if( type == "fx" && queue.length == 1 )
\r
+ queue[0].call(this, function() { jQuery(elem).dequeue(type); });
\r
});
\r
},
\r
dequeue: function(type){
\r
});
\r
},
\r
dequeue: function(type){
\r
@@
-143,6
+147,6
@@
jQuery.fn.extend({
});
\r
},
\r
clearQueue: function(type){
\r
});
\r
},
\r
clearQueue: function(type){
\r
- return this.queue( type, [] );
\r
+ return this.queue( type || "fx", [] );
\r
}
\r
});
\ No newline at end of file
}
\r
});
\ No newline at end of file