diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js index 7285e4993..34241f703 100755 --- a/src/modules/dropdown.js +++ b/src/modules/dropdown.js @@ -349,7 +349,12 @@ $.fn.dropdown = function(parameters) { callback(); } else if($.fn.transition !== undefined) { - $currentMenu.transition(settings.transition + ' in', settings.duration, callback); + $currentMenu.transition({ + animation : settings.transition + ' in', + duration : settings.duration, + complete : callback, + queue : false + }) } else if(settings.transition == 'slide down') { $currentMenu @@ -392,7 +397,12 @@ $.fn.dropdown = function(parameters) { if(dropdown.is.visible($currentMenu) ) { dropdown.verbose('Doing menu hide animation', $currentMenu); if($.fn.transition !== undefined) { - $currentMenu.transition(settings.transition + ' out', settings.duration, callback); + $currentMenu.transition({ + animation : settings.transition + ' out', + duration : settings.duration, + complete : callback, + queue : false + }) } else if(settings.transition == 'none') { callback(); diff --git a/src/modules/transition.js b/src/modules/transition.js index 19e26c107..8e16235bc 100755 --- a/src/modules/transition.js +++ b/src/modules/transition.js @@ -101,7 +101,9 @@ $.fn.transition = function() { settings = overrideSettings || settings; module.debug('Preparing animation', settings.animation); if(module.is.animating()) { - module.queue(settings.animation); + if(settins.queue) { + module.queue(settings.animation); + } return false; } module.save.conditions(); @@ -621,6 +623,9 @@ $.fn.transition.settings = { animation : 'fade', duration : '700ms', + // queue up animations + queue : true, + className : { transition : 'ui transition', animating : 'animating',