From 10e67521a7a8c885c086b991572d3ae549c09b81 Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Sun, 15 May 2016 13:23:38 -0400 Subject: [PATCH] Fixes #3917, adds check for bubbled label event coming from surrounding label --- src/definitions/modules/dropdown.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 0f9c20a5e..79dc3c4b9 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -1009,6 +1009,9 @@ $.fn.dropdown = function(parameters) { ? module.show : module.toggle ; + if(module.is.bubbledLabelClick(event)) { + return; + } if( module.determine.eventOnElement(event, toggleBehavior) ) { event.preventDefault(); } @@ -2920,6 +2923,9 @@ $.fn.dropdown = function(parameters) { active: function() { return $module.hasClass(className.active); }, + bubbledLabelClick: function(event) { + return $(event.target).is('select, input') && $module.closest('label').length > 0; + }, alreadySetup: function() { return ($module.is('select') && $module.parent(selector.dropdown).length > 0 && $module.prev().length === 0); },