Skip to content

Commit

Permalink
Merge pull request #155 from fomantic/clearable-dropdown-fix
Browse files Browse the repository at this point in the history
[Dropdown] Fix the clearable setting that does'nt init a clearable dropdown
  • Loading branch information
Sean authored Oct 5, 2018
2 parents 776d6d5 + 0583aa1 commit beb0ffe
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/definitions/modules/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,8 +1083,6 @@ $.fn.dropdown = function(parameters) {
} else {
module.blurSearch();
}
} else if($icon.hasClass(className.clear)) {
module.clear();
} else {
module.toggle();
}
Expand Down Expand Up @@ -3233,7 +3231,7 @@ $.fn.dropdown = function(parameters) {
return $selectedMenu.hasClass(className.leftward);
},
clearable: function() {
return $module.hasClass(className.clearable);
return ($module.hasClass(className.clearable) || settings.clearable);
},
disabled: function() {
return $module.hasClass(className.disabled);
Expand Down

0 comments on commit beb0ffe

Please sign in to comment.