From 37ad56b62c71c4ce637a4a9fd6c1f28a11e330eb Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 22 Jul 2015 12:52:55 -0400 Subject: [PATCH] Fix issue where dropdown inside label wont open --- src/definitions/modules/dropdown.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 41ac0a920e..49da61ddd3 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -895,7 +895,7 @@ $.fn.dropdown = function(parameters) { toggleBehavior = (module.is.multiple()) ? module.show : module.toggle - ; + ; if( module.determine.eventOnElement(event, toggleBehavior) ) { event.preventDefault(); } @@ -1297,7 +1297,8 @@ $.fn.dropdown = function(parameters) { eventOnElement: function(event, callback) { var $target = $(event.target), - notOnLabel = ($target.closest(selector.siblingLabel).length === 0), + $label = $target.closest(selector.siblingLabel), + notOnLabel = ($module.find($label).length === 0), notInMenu = ($target.closest($menu).length === 0) ; callback = $.isFunction(callback)