mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-29 14:59:16 +02:00
Code Issues Releases Wiki Activity

Drop closest from SelectorEngine (#30653)

Browse Source 
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
This commit is contained in:
Martijn Cuppens
2020-04-28 21:17:23 +02:00
committed by GitHub
parent 06c3c144b6
commit c8d68fbec7
7 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/button.js
View File

@@ -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)