mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 00:24:03 +02:00
Code Issues Releases Wiki Activity

grunt

Browse Source
This commit is contained in:
Mark Otto
2016-12-27 14:13:56 -08:00
parent dac31ebf35
commit 7a91b65d47
16 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/js/bootstrap.js
View File

@@ -2509,6 +2509,7 @@ var Tab = function ($) {
var ClassName = {
DROPDOWN_MENU: 'dropdown-menu',
ACTIVE: 'active',
DISABLED: 'disabled',
FADE: 'fade',
SHOW: 'show'
};
@@ -2546,7 +2547,7 @@ var Tab = function ($) {
Tab.prototype.show = function show() {
var _this20 = 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;
}

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long