git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #7945. Make jQuery.param() serialize plain objects with a property named jquery...
[jquery.git]
/
src
/
queue.js
diff --git
a/src/queue.js
b/src/queue.js
index
23d4360
..
9e3e2fb
100644
(file)
--- a/
src/queue.js
+++ b/
src/queue.js
@@
-7,7
+7,7
@@
jQuery.extend({
}
type = (type || "fx") + "queue";
}
type = (type || "fx") + "queue";
- var q = jQuery.data( elem, type );
+ var q = jQuery._data( elem, type );
// Speed up dequeue by getting out quickly if this is just a lookup
if ( !data ) {
// Speed up dequeue by getting out quickly if this is just a lookup
if ( !data ) {
@@
-15,7
+15,7
@@
jQuery.extend({
}
if ( !q || jQuery.isArray(data) ) {
}
if ( !q || jQuery.isArray(data) ) {
- q = jQuery.data( elem, type, jQuery.makeArray(data) );
+ q = jQuery._data( elem, type, jQuery.makeArray(data) );
} else {
q.push( data );
} else {
q.push( data );
@@
-27,7
+27,8
@@
jQuery.extend({
dequeue: function( elem, type ) {
type = type || "fx";
dequeue: function( elem, type ) {
type = type || "fx";
- var queue = jQuery.queue( elem, type ), fn = queue.shift();
+ var queue = jQuery.queue( elem, type ),
+ fn = queue.shift();
// If the fx queue is dequeued, always remove the progress sentinel
if ( fn === "inprogress" ) {
// If the fx queue is dequeued, always remove the progress sentinel
if ( fn === "inprogress" ) {
@@
-45,6
+46,10
@@
jQuery.extend({
jQuery.dequeue(elem, type);
});
}
jQuery.dequeue(elem, type);
});
}
+
+ if ( !queue.length ) {
+ jQuery.removeData( elem, type + "queue", true );
+ }
}
});
}
});