From eb82f70cb1371e193515d50a7d915932d10cdd47 Mon Sep 17 00:00:00 2001 From: Nathan Kot Date: Sun, 18 May 2014 12:16:27 +1200 Subject: [PATCH] Fix dropdown is.animating when transition is not included. --- src/modules/dropdown.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js index ce556b85c..0da8f5c54 100755 --- a/src/modules/dropdown.js +++ b/src/modules/dropdown.js @@ -567,8 +567,8 @@ $.fn.dropdown = function(parameters) { }, animated: function($subMenu) { return ($subMenu) - ? $subMenu.is(':animated') || $subMenu.transition('is animating') - : $menu.is(':animated') || $menu.transition('is animating') + ? $subMenu.is(':animated') || $subMenu.transition && $subMenu.transition('is animating') + : $menu.is(':animated') || $menu.transition && $menu.transition('is animating') ; }, visible: function($subMenu) { @@ -1003,4 +1003,4 @@ $.extend( $.easing, { }); -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window , document );