diff options
Diffstat (limited to 'ui/jquery.effects.drop.js')
| -rw-r--r-- | ui/jquery.effects.drop.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index f13dda856..152da6b54 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -17,18 +17,17 @@ $.effects.drop = function(o) { return this.queue(function() { // Create element - var el = $(this), props = ['position','top','bottom','left','right','opacity']; - - // Set options - var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode - var direction = o.options.direction || 'left'; // Default Direction + var el = $( this ), + props = ['position','top','bottom','left','right','opacity'], + mode = $.effects.setMode(el, o.mode || 'hide'), + direction = o.direction || 'left'; // Default Direction // Adjust $.effects.save(el, props); el.show(); // Save & Show $.effects.createWrapper(el); // Create Wrapper var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left'; var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg'; - var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2); + var distance = o.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2); if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift // Animation @@ -36,10 +35,10 @@ $.effects.drop = function(o) { animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance; // Animate - el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() { + el.animate(animation, { queue: false, duration: o.duration, easing: o.easing, complete: function() { if(mode == 'hide') el.hide(); // Hide $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore - if(o.callback) o.callback.apply(this, arguments); // Callback + if(o.complete) o.complete.apply(this, arguments); // Callback el.dequeue(); }}); |