From 2b9d684d1aed0fb50fba916ff8c69be5cc3fa4ae Mon Sep 17 00:00:00 2001 From: malsup Date: Mon, 9 Aug 2010 04:43:02 +0800 Subject: [PATCH] Effects: Fix show/hide/toggle test for using core functions. Fixed: #5456 - show() function broken with "normal" speed --- ui/jquery.effects.core.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 801b57e4c..632e0e932 100644 --- a/ui/jquery.effects.core.js +++ b/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 { -- 2.39.5