From cb8726d9e75b10c52c84753da171daacd78aee90 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Sat, 19 Feb 2022 16:22:32 +0200 Subject: Dropdown: use a better selector to avoid triggering click if button is disabled (#35866) --- js/src/dropdown.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'js') 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) -- cgit v1.2.3