Skip to content

Commit 2be34d5

Browse files
mdomdo
committed
dist
1 parent 30e27e7 commit 2be34d5

30 files changed

Lines changed: 180 additions & 166 deletions

‎assets/css/docs.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/docs.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.css‎

Lines changed: 9 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/bootstrap.js‎

Lines changed: 77 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ var Util = function ($) {
5050
MozTransition: 'transitionend',
5151
OTransition: 'oTransitionEnd otransitionend',
5252
transition: 'transitionend'
53+
};
5354

54-
// shoutout AngusCroll (https://goo.gl/pxwQGp)
55-
};function toType(obj) {
55+
// shoutout AngusCroll (https://goo.gl/pxwQGp)
56+
function toType(obj) {
5657
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
5758
}
5859

@@ -215,14 +216,14 @@ var Alert = function ($) {
215216
ALERT: 'alert',
216217
FADE: 'fade',
217218
SHOW: 'show'
219+
};
218220

219-
/**
220-
* ------------------------------------------------------------------------
221-
* Class Definition
222-
* ------------------------------------------------------------------------
223-
*/
221+
/**
222+
* ------------------------------------------------------------------------
223+
* Class Definition
224+
* ------------------------------------------------------------------------
225+
*/
224226

225-
};
226227
var Alert = function () {
227228
function Alert(element) {
228229
_classCallCheck(this, Alert);
@@ -396,14 +397,14 @@ var Button = function ($) {
396397
var Event = {
397398
CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
398399
FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
400+
};
399401

400-
/**
401-
* ------------------------------------------------------------------------
402-
* Class Definition
403-
* ------------------------------------------------------------------------
404-
*/
402+
/**
403+
* ------------------------------------------------------------------------
404+
* Class Definition
405+
* ------------------------------------------------------------------------
406+
*/
405407

406-
};
407408
var Button = function () {
408409
function Button(element) {
409410
_classCallCheck(this, Button);
@@ -606,14 +607,14 @@ var Carousel = function ($) {
606607
INDICATORS: '.carousel-indicators',
607608
DATA_SLIDE: '[data-slide], [data-slide-to]',
608609
DATA_RIDE: '[data-ride="carousel"]'
610+
};
609611

610-
/**
611-
* ------------------------------------------------------------------------
612-
* Class Definition
613-
* ------------------------------------------------------------------------
614-
*/
612+
/**
613+
* ------------------------------------------------------------------------
614+
* Class Definition
615+
* ------------------------------------------------------------------------
616+
*/
615617

616-
};
617618
var Carousel = function () {
618619
function Carousel(element, config) {
619620
_classCallCheck(this, Carousel);
@@ -1090,14 +1091,14 @@ var Collapse = function ($) {
10901091
var Selector = {
10911092
ACTIVES: '.show, .collapsing',
10921093
DATA_TOGGLE: '[data-toggle="collapse"]'
1094+
};
10931095

1094-
/**
1095-
* ------------------------------------------------------------------------
1096-
* Class Definition
1097-
* ------------------------------------------------------------------------
1098-
*/
1096+
/**
1097+
* ------------------------------------------------------------------------
1098+
* Class Definition
1099+
* ------------------------------------------------------------------------
1100+
*/
10991101

1100-
};
11011102
var Collapse = function () {
11021103
function Collapse(element, config) {
11031104
_classCallCheck(this, Collapse);
@@ -1478,14 +1479,14 @@ var Dropdown = function ($) {
14781479
placement: 'string',
14791480
offset: '(number|string)',
14801481
flip: 'boolean'
1482+
};
14811483

1482-
/**
1483-
* ------------------------------------------------------------------------
1484-
* Class Definition
1485-
* ------------------------------------------------------------------------
1486-
*/
1484+
/**
1485+
* ------------------------------------------------------------------------
1486+
* Class Definition
1487+
* ------------------------------------------------------------------------
1488+
*/
14871489

1488-
};
14891490
var Dropdown = function () {
14901491
function Dropdown(element, config) {
14911492
_classCallCheck(this, Dropdown);
@@ -1634,9 +1635,10 @@ var Dropdown = function ($) {
16341635
enabled: this._config.flip
16351636
}
16361637
}
1638+
};
16371639

1638-
// Disable Popper.js for Dropdown in Navbar
1639-
};if (this._inNavbar) {
1640+
// Disable Popper.js for Dropdown in Navbar
1641+
if (this._inNavbar) {
16401642
popperConfig.modifiers.applyStyle = {
16411643
enabled: !this._inNavbar
16421644
};
@@ -1889,14 +1891,14 @@ var Modal = function ($) {
18891891
DATA_DISMISS: '[data-dismiss="modal"]',
18901892
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
18911893
NAVBAR_TOGGLER: '.navbar-toggler'
1894+
};
18921895

1893-
/**
1894-
* ------------------------------------------------------------------------
1895-
* Class Definition
1896-
* ------------------------------------------------------------------------
1897-
*/
1896+
/**
1897+
* ------------------------------------------------------------------------
1898+
* Class Definition
1899+
* ------------------------------------------------------------------------
1900+
*/
18981901

1899-
};
19001902
var Modal = function () {
19011903
function Modal(element, config) {
19021904
_classCallCheck(this, Modal);
@@ -2453,14 +2455,14 @@ var ScrollSpy = function ($) {
24532455
var OffsetMethod = {
24542456
OFFSET: 'offset',
24552457
POSITION: 'position'
2458+
};
24562459

2457-
/**
2458-
* ------------------------------------------------------------------------
2459-
* Class Definition
2460-
* ------------------------------------------------------------------------
2461-
*/
2460+
/**
2461+
* ------------------------------------------------------------------------
2462+
* Class Definition
2463+
* ------------------------------------------------------------------------
2464+
*/
24622465

2463-
};
24642466
var ScrollSpy = function () {
24652467
function ScrollSpy(element, config) {
24662468
var _this20 = this;
@@ -2750,17 +2752,18 @@ var Tab = function ($) {
27502752
DROPDOWN: '.dropdown',
27512753
NAV_LIST_GROUP: '.nav, .list-group',
27522754
ACTIVE: '.active',
2755+
ACTIVE_UL: '> li > .active',
27532756
DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
27542757
DROPDOWN_TOGGLE: '.dropdown-toggle',
27552758
DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
2759+
};
27562760

2757-
/**
2758-
* ------------------------------------------------------------------------
2759-
* Class Definition
2760-
* ------------------------------------------------------------------------
2761-
*/
2761+
/**
2762+
* ------------------------------------------------------------------------
2763+
* Class Definition
2764+
* ------------------------------------------------------------------------
2765+
*/
27622766

2763-
};
27642767
var Tab = function () {
27652768
function Tab(element) {
27662769
_classCallCheck(this, Tab);
@@ -2785,7 +2788,8 @@ var Tab = function ($) {
27852788
var selector = Util.getSelectorFromElement(this._element);
27862789

27872790
if (listElement) {
2788-
previous = $.makeArray($(listElement).find(Selector.ACTIVE));
2791+
var itemSelector = listElement.nodeName === 'UL' ? Selector.ACTIVE_UL : Selector.ACTIVE;
2792+
previous = $.makeArray($(listElement).find(itemSelector));
27892793
previous = previous[previous.length - 1];
27902794
}
27912795

@@ -2843,7 +2847,14 @@ var Tab = function ($) {
28432847
Tab.prototype._activate = function _activate(element, container, callback) {
28442848
var _this23 = this;
28452849

2846-
var active = $(container).find(Selector.ACTIVE)[0];
2850+
var activeElements = void 0;
2851+
if (container.nodeName === 'UL') {
2852+
activeElements = $(container).find(Selector.ACTIVE_UL);
2853+
} else {
2854+
activeElements = $(container).children(Selector.ACTIVE);
2855+
}
2856+
2857+
var active = activeElements[0];
28472858
var isTransitioning = callback && Util.supportsTransitionEnd() && active && $(active).hasClass(ClassName.FADE);
28482859

28492860
var complete = function complete() {
@@ -3061,14 +3072,14 @@ var Tooltip = function ($) {
30613072
FOCUS: 'focus',
30623073
CLICK: 'click',
30633074
MANUAL: 'manual'
3075+
};
30643076

3065-
/**
3066-
* ------------------------------------------------------------------------
3067-
* Class Definition
3068-
* ------------------------------------------------------------------------
3069-
*/
3077+
/**
3078+
* ------------------------------------------------------------------------
3079+
* Class Definition
3080+
* ------------------------------------------------------------------------
3081+
*/
30703082

3071-
};
30723083
var Tooltip = function () {
30733084
function Tooltip(element, config) {
30743085
_classCallCheck(this, Tooltip);
@@ -3687,14 +3698,14 @@ var Popover = function ($) {
36873698
FOCUSOUT: 'focusout' + EVENT_KEY,
36883699
MOUSEENTER: 'mouseenter' + EVENT_KEY,
36893700
MOUSELEAVE: 'mouseleave' + EVENT_KEY
3701+
};
36903702

3691-
/**
3692-
* ------------------------------------------------------------------------
3693-
* Class Definition
3694-
* ------------------------------------------------------------------------
3695-
*/
3703+
/**
3704+
* ------------------------------------------------------------------------
3705+
* Class Definition
3706+
* ------------------------------------------------------------------------
3707+
*/
36963708

3697-
};
36983709
var Popover = function (_Tooltip) {
36993710
_inherits(Popover, _Tooltip);
37003711

‎dist/js/bootstrap.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/dist/alert.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/dist/alert.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)