Skip to content

Commit

Permalink
Fix issue where dropdown inside label wont open
Browse files Browse the repository at this point in the history
  • Loading branch information
jlukic committed Jul 22, 2015
1 parent 5bca2d9 commit 37ad56b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/definitions/modules/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ $.fn.dropdown = function(parameters) {
toggleBehavior = (module.is.multiple())
? module.show
: module.toggle
;
;
if( module.determine.eventOnElement(event, toggleBehavior) ) {
event.preventDefault();
}
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 37ad56b

Please sign in to comment.