From c8d68fbec79085780e83efc2ceb714a678bfe4f1 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Tue, 28 Apr 2020 21:17:23 +0200 Subject: Drop closest from SelectorEngine (#30653) Co-authored-by: XhmikosR --- js/src/button.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index 9c68862b2..cf346863d 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -23,7 +23,6 @@ const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' const CLASS_NAME_ACTIVE = 'active' -const CLASS_NAME_BUTTON = 'btn' const CLASS_NAME_DISABLED = 'disabled' const CLASS_NAME_FOCUS = 'focus' @@ -61,10 +60,7 @@ class Button { let triggerChangeEvent = true let addAriaPressed = true - const rootElement = SelectorEngine.closest( - this._element, - SELECTOR_DATA_TOGGLE - ) + const rootElement = this._element.closest(SELECTOR_DATA_TOGGLE) if (rootElement) { const input = SelectorEngine.findOne(SELECTOR_INPUT, this._element) @@ -143,10 +139,7 @@ class Button { EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, event => { event.preventDefault() - let button = event.target - if (!button.classList.contains(CLASS_NAME_BUTTON)) { - button = SelectorEngine.closest(button, SELECTOR_BUTTON) - } + const button = event.target.closest(SELECTOR_BUTTON) let data = Data.getData(button, DATA_KEY) if (!data) { @@ -157,7 +150,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, eve }) EventHandler.on(document, EVENT_FOCUS_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, event => { - const button = SelectorEngine.closest(event.target, SELECTOR_BUTTON) + const button = event.target.closest(SELECTOR_BUTTON) if (button) { button.classList.add(CLASS_NAME_FOCUS) @@ -165,7 +158,7 @@ EventHandler.on(document, EVENT_FOCUS_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, eve }) EventHandler.on(document, EVENT_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, event => { - const button = SelectorEngine.closest(event.target, SELECTOR_BUTTON) + const button = event.target.closest(SELECTOR_BUTTON) if (button) { button.classList.remove(CLASS_NAME_FOCUS) -- cgit v1.2.3