Browse Source

moves clickaway event till after show to prevent bubbling from toggle to doc

pull/2229/head
jlukic 11 years ago
parent
commit
c0c46909c8
1 changed files with 6 additions and 9 deletions
  1. 15
      src/modules/dropdown.js

15
src/modules/dropdown.js

@ -68,11 +68,6 @@ $.fn.dropdown = function(parameters) {
module.bind.touchEvents(); module.bind.touchEvents();
} }
module.bind.mouseEvents(); module.bind.mouseEvents();
$document
.one('mousemove' + eventNamespace, module.set.hasMouse)
;
module.instantiate(); module.instantiate();
}, },
@ -518,10 +513,12 @@ $.fn.dropdown = function(parameters) {
if( module.is.hidden() ) { if( module.is.hidden() ) {
module.hideOthers(); module.hideOthers();
module.set.active(); 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)(); $.proxy(settings.onShow, element)();
} }
}, },

Loading…
Cancel
Save