Permalink
Browse files

Effects: Fix show/hide/toggle test for using core functions. Fixed: #…

…5456 - show() function broken with "normal" speed
  • Loading branch information...
1 parent 3be1105 commit 2b9d684d1aed0fb50fba916ff8c69be5cc3fa4ae @malsup malsup committed with scottgonzalez Aug 8, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 ui/jquery.effects.core.js
@@ -455,7 +455,7 @@ $.fn.extend({
_show: $.fn.show,
show: function(speed) {
- if (!speed || typeof speed == 'number' || $.fx.speeds[speed]) {
+ if (!speed || typeof speed == 'number' || $.fx.speeds[speed] || !$.effects[speed] ) {
return this._show.apply(this, arguments);
} else {
var args = _normalizeArguments.apply(this, arguments);
@@ -466,7 +466,7 @@ $.fn.extend({
_hide: $.fn.hide,
hide: function(speed) {
- if (!speed || typeof speed == 'number' || $.fx.speeds[speed]) {
+ if (!speed || typeof speed == 'number' || $.fx.speeds[speed] || !$.effects[speed] ) {
return this._hide.apply(this, arguments);
} else {
var args = _normalizeArguments.apply(this, arguments);
@@ -475,10 +475,10 @@ $.fn.extend({
}
},
- // jQuery core overloads toggle and create _toggle
+ // jQuery core overloads toggle and creates _toggle
__toggle: $.fn.toggle,
toggle: function(speed) {
- if (!speed || typeof speed == 'number' || $.fx.speeds[speed] ||
+ if (!speed || typeof speed == 'number' || $.fx.speeds[speed] || !$.effects[speed] ||
typeof speed == 'boolean' || $.isFunction(speed)) {
return this.__toggle.apply(this, arguments);
} else {

0 comments on commit 2b9d684

Please sign in to comment.