diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2011-12-06 15:25:38 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-12-06 15:25:38 -0500 |
| commit | 6c2a501de40a5f6b3ad382e2d309e5a10fce04d0 (patch) | |
| tree | c72333c9a1d5d29acd4e3224ddf6d4e4e00db5fe /src/queue.js | |
| parent | d511613d748a92af04a3f07943f34f9baadc4153 (diff) | |
| download | jquery-6c2a501de40a5f6b3ad382e2d309e5a10fce04d0.tar.gz jquery-6c2a501de40a5f6b3ad382e2d309e5a10fce04d0.zip | |
Fix #5571. Setters should treat `undefined` as a no-op and be chainable.
Diffstat (limited to 'src/queue.js')
| -rw-r--r-- | src/queue.js | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/queue.js b/src/queue.js index ef97485f9..da3e59721 100644 --- a/src/queue.js +++ b/src/queue.js @@ -100,21 +100,27 @@ jQuery.extend({ jQuery.fn.extend({ queue: function( type, data ) { + var setter = 2; + if ( typeof type !== "string" ) { data = type; type = "fx"; + setter--; } - if ( data === undefined ) { + if ( arguments.length < setter ) { return jQuery.queue( this[0], type ); } - return this.each(function() { - var queue = jQuery.queue( this, type, data ); - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); }, dequeue: function( type ) { return this.each(function() { |