diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 805d06f8a..88d1426ba 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -496,7 +496,7 @@ $.fn.dropdown = function(parameters) { ? callback : function(){} ; - if( module.is.active() ) { + if( module.is.active() && !module.is.animatingOutward() ) { module.debug('Hiding dropdown'); if(settings.onHide.call(element) !== false) { module.animate.hide(function() { @@ -3075,6 +3075,12 @@ $.fn.dropdown = function(parameters) { active: function() { return $module.hasClass(className.active); }, + animatingInward: function() { + return $menu.transition('is inward'); + }, + animatingOutward: function() { + return $menu.transition('is outward'); + }, bubbledLabelClick: function(event) { return $(event.target).is('select, input') && $module.closest('label').length > 0; }, @@ -3369,7 +3375,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, debug : settings.debug, verbose : settings.verbose, - queue : true, + queue : false, onStart : start, onComplete : function() { callback.call(element); @@ -3876,4 +3882,4 @@ $.fn.dropdown.settings.templates = { }; -})( jQuery, window, document ); +})( jQuery, window, document ); \ No newline at end of file