From 0e8ee1bfba8351696fbe524fc14aed74e1e402cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Dec 2016 15:47:03 -0800 Subject: grunt --- js/dist/tab.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/dist/tab.js') 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; } -- cgit v1.2.3