diff options
author | Scott González <scott.gonzalez@gmail.com> | 2011-05-02 08:54:36 -0400 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-02 08:54:36 -0400 |
commit | 4120c9cf4a99114978191574b19d9cf984a887d0 (patch) | |
tree | ad9702046106491f208badf44c0e9113dabde762 | |
parent | 804a6ca7bf8dac556bac35aa4be91b1be3cde13e (diff) | |
parent | c13ef9e037d9ba534697f66d213bbb324db85117 (diff) | |
download | jquery-ui-4120c9cf4a99114978191574b19d9cf984a887d0.tar.gz jquery-ui-4120c9cf4a99114978191574b19d9cf984a887d0.zip |
Merge remote branch 'gnarf37/widget-show-hide'
-rw-r--r-- | ui/jquery.ui.widget.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 6a9bd3641..a74e6b77b 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -365,7 +365,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { if (options.delay) { element.delay( options.delay ); } - if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { + if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) { element[ method ]( options ); } else if ( effectName !== method && element[ effectName ] ) { element[ effectName ]( options.duration, options.easing, callback ); @@ -384,7 +384,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { if ( $.uiBackCompat !== false ) { $.Widget.prototype._getCreateOptions = function() { return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ]; - } + }; } })( jQuery ); |