diff options
| author | Mark Otto <[email protected]> | 2016-12-25 15:47:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-12-25 15:47:03 -0800 |
| commit | 0e8ee1bfba8351696fbe524fc14aed74e1e402cc (patch) | |
| tree | b173c217e46e640d6f7b4b9f7116a905b396aa58 /js/dist/tab.js | |
| parent | c2e5eb154275f10c38d903af1cc069bce501a932 (diff) | |
| download | bootstrap-0e8ee1bfba8351696fbe524fc14aed74e1e402cc.tar.xz bootstrap-0e8ee1bfba8351696fbe524fc14aed74e1e402cc.zip | |
grunt
Diffstat (limited to 'js/dist/tab.js')
| -rw-r--r-- | js/dist/tab.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/dist/tab.js b/js/dist/tab.js index d7ddfd8a3..34cc97187 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; } |