aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorGeoSot <[email protected]>2021-07-08 17:59:18 +0300
committerXhmikosR <[email protected]>2021-07-22 17:54:48 +0300
commitb1dad0943f4fc8c6eb6bf58f5e38a5615dd78e5b (patch)
tree04aaba03dc0e280707ae6c6ec00aa725247d1026 /js/src
parentd01a08547def495cb1c814ffaecb9d36cad14acd (diff)
downloadbootstrap-b1dad0943f4fc8c6eb6bf58f5e38a5615dd78e5b.tar.xz
bootstrap-b1dad0943f4fc8c6eb6bf58f5e38a5615dd78e5b.zip
handle click event in one place, remove undocumented click listener on element in case of not having the proper markup
Diffstat (limited to 'js/src')
-rw-r--r--js/src/dropdown.js12
1 files changed, 1 insertions, 11 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 1e0029a60..95752d998 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -48,7 +48,6 @@ const EVENT_HIDE = `hide${EVENT_KEY}`
const EVENT_HIDDEN = `hidden${EVENT_KEY}`
const EVENT_SHOW = `show${EVENT_KEY}`
const EVENT_SHOWN = `shown${EVENT_KEY}`
-const EVENT_CLICK = `click${EVENT_KEY}`
const EVENT_CLICK_DATA_API = `click${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}`
@@ -103,8 +102,6 @@ class Dropdown extends BaseComponent {
this._config = this._getConfig(config)
this._menu = this._getMenuElement()
this._inNavbar = this._detectNavbar()
-
- this._addEventListeners()
}
// Getters
@@ -218,13 +215,6 @@ class Dropdown extends BaseComponent {
// Private
- _addEventListeners() {
- EventHandler.on(this._element, EVENT_CLICK, event => {
- event.preventDefault()
- this.toggle()
- })
- }
-
_completeHide(relatedTarget) {
const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE, relatedTarget)
if (hideEvent.defaultPrevented) {
@@ -490,7 +480,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, Dropdown.clearMenus)
EventHandler.on(document, EVENT_KEYUP_DATA_API, Dropdown.clearMenus)
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
event.preventDefault()
- Dropdown.getOrCreateInstance(this)
+ Dropdown.getOrCreateInstance(this).toggle()
})
/**