aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.effects.drop.js
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-04-20 11:06:11 -0400
committerScott González <scott.gonzalez@gmail.com>2012-04-20 11:06:11 -0400
commit308b55e50ca781ad9db08a252f313ee2e8e2f257 (patch)
treeb287b6936d45efdfe067d2bdf4c732b13a1726bd /ui/jquery.effects.drop.js
parent2cf9948cadf45a24c591d6f7232f2470b4d9743e (diff)
parent33df9b788d3f60459c43acbfefdfeef8a07ce632 (diff)
downloadjquery-ui-308b55e50ca781ad9db08a252f313ee2e8e2f257.tar.gz
jquery-ui-308b55e50ca781ad9db08a252f313ee2e8e2f257.zip
Merge branch 'master' into position-notification
Diffstat (limited to 'ui/jquery.effects.drop.js')
-rw-r--r--ui/jquery.effects.drop.js24
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();
}
});