diff options
| author | gnarf <gnarf@gnarf.net> | 2011-05-01 06:24:22 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-05-01 06:24:22 -0500 |
| commit | 1eada2154910102e4c39d131a23af24ad0d92815 (patch) | |
| tree | 29a8318e17911718140698d5cf55ab98b686d136 /ui/jquery.effects.scale.js | |
| parent | ec5aeb1b154a023e2630d21aa7982ca13a00f03e (diff) | |
| download | jquery-ui-1eada2154910102e4c39d131a23af24ad0d92815.tar.gz jquery-ui-1eada2154910102e4c39d131a23af24ad0d92815.zip | |
effects.*: Updating fade, pulsate, scale, shake to pass units
Diffstat (limited to 'ui/jquery.effects.scale.js')
| -rw-r--r-- | ui/jquery.effects.scale.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js index 8f25ca9a8..843aa2241 100644 --- a/ui/jquery.effects.scale.js +++ b/ui/jquery.effects.scale.js @@ -25,6 +25,7 @@ $.effects.effect.puff = function( o ) { $.extend(o, { effect: 'scale', + queue: false, fade: true, mode: mode, percent: mode == 'hide' ? percent : 100, @@ -36,13 +37,13 @@ $.effects.effect.puff = function( o ) { } }); - elem.effect( o ).dequeue(); + elem.effect( o ); }); }; $.effects.effect.scale = function( o ) { - return this.queue( function() { + return this[ o.queue === false ? "each" : "queue" ]( function() { // Create element var el = $( this ), @@ -62,6 +63,7 @@ $.effects.effect.scale = function( o ) { // We are going to pass this effect to the size effect: options.effect = "size"; + options.queue = false; // Set default origin and restore for show/hide if ( mode != 'effect' ) { @@ -87,14 +89,14 @@ $.effects.effect.scale = function( o ) { }; // Animate - el.effect(options).dequeue(); + el.effect(options); }); }; $.effects.effect.size = function( o ) { - return this.queue( function() { + return this[ o.queue === false ? "each" : "queue" ]( function() { // Create element var el = $( this ), props = [ 'position', 'top', 'bottom', 'left', 'right', 'width', 'height', 'overflow', 'opacity' ], |