diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-07-28 15:16:20 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-07-28 15:16:20 +0200 |
| commit | 5a45f483d73578dd147229d412998bba4a44c35b (patch) | |
| tree | 540e9c5ca8502fa0277d072de973a9c676134793 /ui/jquery.effects.fade.js | |
| parent | 5297b7bc4250462213b05ad2763fe99d0f8dedec (diff) | |
| parent | 0ba493d3b4f9d6da35cadc499e9f7ebb6adb31b3 (diff) | |
| download | jquery-ui-5a45f483d73578dd147229d412998bba4a44c35b.tar.gz jquery-ui-5a45f483d73578dd147229d412998bba4a44c35b.zip | |
Merge branch 'master' into widget-delegation
Diffstat (limited to 'ui/jquery.effects.fade.js')
| -rw-r--r-- | ui/jquery.effects.fade.js | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/ui/jquery.effects.fade.js b/ui/jquery.effects.fade.js index ff1cba5f8..9b79ad3bc 100644 --- a/ui/jquery.effects.fade.js +++ b/ui/jquery.effects.fade.js @@ -12,29 +12,24 @@ */ (function( $, undefined ) { -$.effects.effect.fade = function( o ) { - return this.queue( function( next ) { - var el = $( this ), - mode = $.effects.setMode( el, o.mode || 'toggle' ), - hide = mode === "hide"; +$.effects.effect.fade = function( o, done ) { + var el = $( this ), + mode = $.effects.setMode( el, o.mode || "toggle" ), + hide = mode === "hide"; - el.show(); - el.animate({ - opacity: hide ? 0 : 1 - }, { - queue: false, - duration: o.duration, - easing: o.easing, - complete: function() { - if ( hide ) { - el.hide(); - } - if ( o.complete ) { - o.complete.call( this ); - } - next(); + el.show(); + el.animate({ + opacity: hide ? 0 : 1 + }, { + queue: false, + duration: o.duration, + easing: o.easing, + complete: function() { + if ( hide ) { + el.hide(); } - }); + done(); + } }); }; |