From c0c46909c8d7ec87247f5360806c18ef880a9ddc Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 18 Oct 2013 19:47:58 -0400 Subject: [PATCH] moves clickaway event till after show to prevent bubbling from toggle to doc --- src/modules/dropdown.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js index ffcd9acec..f6c15e12b 100755 --- a/src/modules/dropdown.js +++ b/src/modules/dropdown.js @@ -68,11 +68,6 @@ $.fn.dropdown = function(parameters) { module.bind.touchEvents(); } module.bind.mouseEvents(); - - $document - .one('mousemove' + eventNamespace, module.set.hasMouse) - ; - module.instantiate(); }, @@ -518,10 +513,12 @@ $.fn.dropdown = function(parameters) { if( module.is.hidden() ) { module.hideOthers(); module.set.active(); - module.animate.show(module.set.visible); - if( module.can.click() ) { - module.bind.intent(); - } + module.animate.show(function() { + if( module.can.click() ) { + module.bind.intent(); + } + module.set.visible(); + }); $.proxy(settings.onShow, element)(); } },