Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Rodi <coorasse@gmail.com>2016-12-25 10:31:34 +0300
committerMark Otto <markd.otto@gmail.com>2016-12-25 10:31:34 +0300
commit9103bffe37d366f8b2a4092092ddec850917d260 (patch)
tree9c192ee2b59520d3acc4244b430bb55cf5e5c4ae /js/src/tab.js
parent0d96c633b3df66c54fa1e67883f68d802c3f7f83 (diff)
[Fix #19849] Tabs are opened even if disabled. (#20795)
* [Fix #19849] Tabs are opened even if disabled. * fix hund code review hints * rollback hound issues because Travis fails
Diffstat (limited to 'js/src/tab.js')
-rw-r--r--js/src/tab.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/src/tab.js b/js/src/tab.js
index c7e5fbfbe9..2f4e453e06 100644
--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -36,6 +36,7 @@ const Tab = (($) => {
const ClassName = {
DROPDOWN_MENU : 'dropdown-menu',
ACTIVE : 'active',
+ DISABLED : 'disabled',
FADE : 'fade',
SHOW : 'show'
}
@@ -79,7 +80,8 @@ const Tab = (($) => {
show() {
if (this._element.parentNode &&
this._element.parentNode.nodeType === Node.ELEMENT_NODE &&
- $(this._element).hasClass(ClassName.ACTIVE)) {
+ $(this._element).hasClass(ClassName.ACTIVE) ||
+ $(this._element).hasClass(ClassName.DISABLED)) {
return
}