diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js index f7c138262..ffcd9acec 100755 --- a/src/modules/dropdown.js +++ b/src/modules/dropdown.js @@ -161,9 +161,9 @@ $.fn.dropdown = function(parameters) { event: { test: { toggle: function(event) { - module.determine.intent(event, module.toggle); - event.preventDefault(); - event.stopImmediatePropagation(); + if( module.determine.intent(event, module.toggle) ) { + event.preventDefault(); + } }, touch: function(event) { module.determine.intent(event, function() { @@ -254,9 +254,11 @@ $.fn.dropdown = function(parameters) { if( $(event.target).closest($menu).size() === 0 ) { module.verbose('Triggering event', callback); callback(); + return true; } else { module.verbose('Event occurred in dropdown, canceling callback'); + return false; } } },