diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 41ab65fc8..916b6fbf7 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -532,13 +532,15 @@ $.fn.dropdown = function(parameters) { item: { mouseenter: function(event) { var - $currentMenu = $(this).find(selector.menu), + $currentMenu = $(this).children(selector.menu), $otherMenus = $(this).siblings(selector.item).children(selector.menu) ; if( $currentMenu.size() > 0 ) { clearTimeout(module.itemTimer); module.itemTimer = setTimeout(function() { - module.animate.hide(false, $otherMenus); + $.each($otherMenus, function() { + module.animate.hide(false, $(this)); + }); module.verbose('Showing sub-menu', $currentMenu); module.animate.show(false, $currentMenu); }, settings.delay.show); @@ -548,7 +550,7 @@ $.fn.dropdown = function(parameters) { mouseleave: function(event) { var - $currentMenu = $(this).find(selector.menu) + $currentMenu = $(this).children(selector.menu) ; if($currentMenu.size() > 0) { clearTimeout(module.itemTimer); @@ -1047,7 +1049,7 @@ $.fn.dropdown = function(parameters) { ; callback = callback || function(){}; module.verbose('Doing menu show animation', $currentMenu); - if( module.is.animating() || module.is.hidden($currentMenu) ) { + if( module.is.hidden($currentMenu) || module.is.animating($currentMenu) ) { if(settings.transition == 'none') { $.proxy(callback, element)(); } @@ -1118,6 +1120,9 @@ $.fn.dropdown = function(parameters) { } ; callback = callback || function(){}; + if($currentMenu.size() === 0) { + debugger; + } if( module.is.visible($currentMenu) || module.is.animating($currentMenu) ) { module.verbose('Doing menu hide animation', $currentMenu);