diff options
author | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:52:47 +0200 |
---|---|---|
committer | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:52:47 +0200 |
commit | c6a8d7ee3c9803d9944db6f55778810592a36452 (patch) | |
tree | abb3df79a0eb6d9bb4713ab73da8ddc60d8a7674 /ui/jquery.effects.drop.js | |
parent | 41dfb09aeb5df7d53089b58959d21207de63edbe (diff) | |
parent | d393c8b4cb26ec34878c22202da6ba9393e0094d (diff) | |
download | jquery-ui-c6a8d7ee3c9803d9944db6f55778810592a36452.tar.gz jquery-ui-c6a8d7ee3c9803d9944db6f55778810592a36452.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.effects.drop.js')
-rw-r--r-- | ui/jquery.effects.drop.js | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index 6c72be9e5..ea8d242d5 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -14,7 +14,7 @@ $.effects.effect.drop = function( o, done ) { - var el = $( this ), + var el = $( this ), props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ], mode = $.effects.setMode( el, o.mode || "hide" ), show = mode === "show", @@ -27,9 +27,9 @@ $.effects.effect.drop = function( o, done ) { distance; // Adjust - $.effects.save( el, props ); - el.show(); - $.effects.createWrapper( el ); + $.effects.save( el, props ); + el.show(); + $.effects.createWrapper( el ); distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]({ margin: true }) / 2; @@ -40,22 +40,22 @@ $.effects.effect.drop = function( o, done ) { } // Animation - animation[ ref ] = ( show ? - ( motion === "pos" ? "+=" : "-=" ) : + animation[ ref ] = ( show ? + ( motion === "pos" ? "+=" : "-=" ) : ( motion === "pos" ? "-=" : "+=" ) ) + distance; // Animate - el.animate( animation, { - queue: false, - duration: o.duration, - easing: o.easing, + el.animate( animation, { + queue: false, + duration: o.duration, + easing: o.easing, complete: function() { if ( mode === "hide" ) { el.hide(); } - $.effects.restore( el, props ); - $.effects.removeWrapper( el ); + $.effects.restore( el, props ); + $.effects.removeWrapper( el ); done(); } }); |