Skip to content
Permalink
Browse files

Merge remote branch 'gnarf37/widget-show-hide'

  • Loading branch information...
scottgonzalez committed May 2, 2011
2 parents 804a6ca + c13ef9e commit 4120c9cf4a99114978191574b19d9cf984a887d0
Showing with 2 additions and 2 deletions.
  1. +2 −2 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 );

0 comments on commit 4120c9c

Please sign in to comment.
You can’t perform that action at this time.