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:
authorMark Otto <markdotto@gmail.com>2016-12-26 02:47:03 +0300
committerMark Otto <markdotto@gmail.com>2016-12-26 02:47:03 +0300
commit0e8ee1bfba8351696fbe524fc14aed74e1e402cc (patch)
treeb173c217e46e640d6f7b4b9f7116a905b396aa58 /js/dist/tab.js
parentc2e5eb154275f10c38d903af1cc069bce501a932 (diff)
grunt
Diffstat (limited to 'js/dist/tab.js')
-rw-r--r--js/dist/tab.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/dist/tab.js b/js/dist/tab.js
index d7ddfd8a38..34cc971873 100644
--- a/js/dist/tab.js
+++ b/js/dist/tab.js
@@ -36,6 +36,7 @@ var Tab = function ($) {
var ClassName = {
DROPDOWN_MENU: 'dropdown-menu',
ACTIVE: 'active',
+ DISABLED: 'disabled',
FADE: 'fade',
SHOW: 'show'
};
@@ -73,7 +74,7 @@ var Tab = function ($) {
Tab.prototype.show = function show() {
var _this = this;
- if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(ClassName.ACTIVE)) {
+ if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(ClassName.ACTIVE) || $(this._element).hasClass(ClassName.DISABLED)) {
return;
}