aboutsummaryrefslogtreecommitdiff
path: root/js/dist/tab.js
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2021-05-05 22:32:12 +0300
committerGitHub <[email protected]>2021-05-05 22:32:12 +0300
commitbf0936748602c8109fd916c64b4560799fa1c3f8 (patch)
treed88687012f32cff8e7039bdc2d470565aa83cc59 /js/dist/tab.js
parent48ae5a7149d30d7d80cecbaaabaa88f7679c9172 (diff)
downloadbootstrap-5.0.0.tar.xz
bootstrap-5.0.0.zip
Release v5.0.0 (#33647)v5.0.0
* Bump version to 5.0.0 * Fix npm tag * Dist
Diffstat (limited to 'js/dist/tab.js')
-rw-r--r--js/dist/tab.js29
1 files changed, 21 insertions, 8 deletions
diff --git a/js/dist/tab.js b/js/dist/tab.js
index 14ed67ef9..4bd9ad294 100644
--- a/js/dist/tab.js
+++ b/js/dist/tab.js
@@ -1,5 +1,5 @@
/*!
- * Bootstrap tab.js v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap tab.js v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
@@ -18,7 +18,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): util/index.js
+ * Bootstrap (v5.0.0): util/index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@
if (hrefAttr.includes('#') && !hrefAttr.startsWith('#')) {
- hrefAttr = '#' + hrefAttr.split('#')[1];
+ hrefAttr = `#${hrefAttr.split('#')[1]}`;
}
selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : null;
@@ -157,7 +157,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): tab.js
+ * Bootstrap (v5.0.0): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -201,7 +201,7 @@
show() {
- if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && this._element.classList.contains(CLASS_NAME_ACTIVE) || isDisabled(this._element)) {
+ if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && this._element.classList.contains(CLASS_NAME_ACTIVE)) {
return;
}
@@ -289,11 +289,17 @@
element.classList.add(CLASS_NAME_SHOW);
}
- if (element.parentNode && element.parentNode.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
+ let parent = element.parentNode;
+
+ if (parent && parent.nodeName === 'LI') {
+ parent = parent.parentNode;
+ }
+
+ if (parent && parent.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
const dropdownElement = element.closest(SELECTOR_DROPDOWN);
if (dropdownElement) {
- SelectorEngine__default['default'].find(SELECTOR_DROPDOWN_TOGGLE).forEach(dropdown => dropdown.classList.add(CLASS_NAME_ACTIVE));
+ SelectorEngine__default['default'].find(SELECTOR_DROPDOWN_TOGGLE, dropdownElement).forEach(dropdown => dropdown.classList.add(CLASS_NAME_ACTIVE));
}
element.setAttribute('aria-expanded', true);
@@ -328,7 +334,14 @@
EventHandler__default['default'].on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
- event.preventDefault();
+ if (['A', 'AREA'].includes(this.tagName)) {
+ event.preventDefault();
+ }
+
+ if (isDisabled(this)) {
+ return;
+ }
+
const data = Data__default['default'].get(this, DATA_KEY) || new Tab(this);
data.show();
});