diff options
| author | GeoSot <geo.sotis@gmail.com> | 2022-02-19 17:22:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-19 17:22:32 +0300 |
| commit | cb8726d9e75b10c52c84753da171daacd78aee90 (patch) | |
| tree | c6e774190678c49f8e8cbc673c369d9896e1360f /js | |
| parent | 353ad45b4b8dd3235a9e26dcc614baaa7fa1a840 (diff) | |
Dropdown: use a better selector to avoid triggering click if button is disabled (#35866)
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/dropdown.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 4bb1379f57..da56f48256 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -49,7 +49,7 @@ const CLASS_NAME_DROPUP = 'dropup' const CLASS_NAME_DROPEND = 'dropend' const CLASS_NAME_DROPSTART = 'dropstart' -const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="dropdown"]' +const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="dropdown"]:not(.disabled):not(:disabled)' const SELECTOR_DATA_TOGGLE_SHOWN = `${SELECTOR_DATA_TOGGLE}.${CLASS_NAME_SHOW}` const SELECTOR_MENU = '.dropdown-menu' const SELECTOR_NAVBAR = '.navbar' @@ -407,10 +407,6 @@ class Dropdown extends BaseComponent { event.preventDefault() event.stopPropagation() - if (isDisabled(this)) { - return - } - const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, delegateTarget.parentNode) const instance = Dropdown.getOrCreateInstance(getToggleButton) |