mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 17:14:04 +02:00
Code Issues Releases Wiki Activity

Use our isDisabled util on dropdown (#33456)

Browse Source
This commit is contained in:
GeoSot
2021-03-30 07:42:23 +03:00
committed by GitHub
parent 232e392c91
commit 8c3e6ebc6e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/dropdown.js
View File

@@ -10,6 +10,7 @@ import * as Popper from '@popperjs/core'
import { import {
defineJQueryPlugin, defineJQueryPlugin,
getElementFromSelector, getElementFromSelector,
isDisabled,
isElement, isElement,
isVisible, isVisible,
isRTL, isRTL,
@@ -51,7 +52,6 @@ const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
const EVENT_KEYDOWN_DATA_API = `keydown${EVENT_KEY}${DATA_API_KEY}` const EVENT_KEYDOWN_DATA_API = `keydown${EVENT_KEY}${DATA_API_KEY}`
const EVENT_KEYUP_DATA_API = `keyup${EVENT_KEY}${DATA_API_KEY}` const EVENT_KEYUP_DATA_API = `keyup${EVENT_KEY}${DATA_API_KEY}`
const CLASS_NAME_DISABLED = 'disabled'
const CLASS_NAME_SHOW = 'show' const CLASS_NAME_SHOW = 'show'
const CLASS_NAME_DROPUP = 'dropup' const CLASS_NAME_DROPUP = 'dropup'
const CLASS_NAME_DROPEND = 'dropend' const CLASS_NAME_DROPEND = 'dropend'
@@ -121,7 +121,7 @@ class Dropdown extends BaseComponent {
// Public // Public
toggle() { toggle() {
if (this._element.disabled || this._element.classList.contains(CLASS_NAME_DISABLED)) { if (isDisabled(this._element)) {
return return
} }
@@ -137,7 +137,7 @@ class Dropdown extends BaseComponent {
} }
show() { show() {
if (this._element.disabled || this._element.classList.contains(CLASS_NAME_DISABLED) || this._menu.classList.contains(CLASS_NAME_SHOW)) { if (isDisabled(this._element) || this._menu.classList.contains(CLASS_NAME_SHOW)) {
return return
} }
@@ -204,7 +204,7 @@ class Dropdown extends BaseComponent {
} }
hide() { hide() {
if (this._element.disabled || this._element.classList.contains(CLASS_NAME_DISABLED) || !this._menu.classList.contains(CLASS_NAME_SHOW)) { if (isDisabled(this._element) || !this._menu.classList.contains(CLASS_NAME_SHOW)) {
return return
} }
@@ -466,7 +466,7 @@ class Dropdown extends BaseComponent {
event.preventDefault() event.preventDefault()
event.stopPropagation() event.stopPropagation()
if (this.disabled || this.classList.contains(CLASS_NAME_DISABLED)) { if (isDisabled(this)) {
return return
} }