Browse Source

Merge pull request #844 from nathankot/fix-transition-detection

Fix dropdown is.animating when transition is not included.
pull/868/head
Jack Lukic 10 years ago
parent
commit
6f55598df9
1 changed files with 3 additions and 3 deletions
  1. 6
      src/modules/dropdown.js

6
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 );
})( jQuery, window , document );
Loading…
Cancel
Save