1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-27 13:59:06 +02:00
This commit is contained in:
Mark Otto
2017-09-12 22:24:15 -07:00
parent 5becfa6fb1
commit 75d435f76e
31 changed files with 543 additions and 2282 deletions

View File

@@ -3530,6 +3530,8 @@ tbody.collapse.show {
.navbar-collapse {
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
-ms-flex-positive: 1;
flex-grow: 1;
-ms-flex-align: center;
align-items: center;
}
@@ -3597,6 +3599,8 @@ tbody.collapse.show {
.navbar-expand-sm .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
-ms-flex-preferred-size: auto;
flex-basis: auto;
}
.navbar-expand-sm .navbar-toggler {
display: none;
@@ -3643,6 +3647,8 @@ tbody.collapse.show {
.navbar-expand-md .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
-ms-flex-preferred-size: auto;
flex-basis: auto;
}
.navbar-expand-md .navbar-toggler {
display: none;
@@ -3689,6 +3695,8 @@ tbody.collapse.show {
.navbar-expand-lg .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
-ms-flex-preferred-size: auto;
flex-basis: auto;
}
.navbar-expand-lg .navbar-toggler {
display: none;
@@ -3735,6 +3743,8 @@ tbody.collapse.show {
.navbar-expand-xl .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
-ms-flex-preferred-size: auto;
flex-basis: auto;
}
.navbar-expand-xl .navbar-toggler {
display: none;
@@ -3784,6 +3794,8 @@ tbody.collapse.show {
.navbar-expand .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
-ms-flex-preferred-size: auto;
flex-basis: auto;
}
.navbar-expand .navbar-toggler {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -33,10 +33,9 @@ var Util = function () {
MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend',
transition: 'transitionend'
};
// shoutout AngusCroll (https://goo.gl/pxwQGp)
function toType(obj) {
};function toType(obj) {
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
}
@@ -256,7 +255,6 @@ var Alert = function () {
ALERT: 'alert',
FADE: 'fade',
SHOW: 'show'
};
/**
* ------------------------------------------------------------------------
@@ -264,6 +262,7 @@ var Alert = function () {
* ------------------------------------------------------------------------
*/
};
var Alert = function () {
function Alert(element) {
classCallCheck(this, Alert);
@@ -436,7 +435,6 @@ var Button = function () {
var Event = {
CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
};
/**
* ------------------------------------------------------------------------
@@ -444,6 +442,7 @@ var Button = function () {
* ------------------------------------------------------------------------
*/
};
var Button = function () {
function Button(element) {
classCallCheck(this, Button);
@@ -645,7 +644,6 @@ var Carousel = function () {
INDICATORS: '.carousel-indicators',
DATA_SLIDE: '[data-slide], [data-slide-to]',
DATA_RIDE: '[data-ride="carousel"]'
};
/**
* ------------------------------------------------------------------------
@@ -653,6 +651,7 @@ var Carousel = function () {
* ------------------------------------------------------------------------
*/
};
var Carousel = function () {
function Carousel(element, config) {
classCallCheck(this, Carousel);
@@ -1129,7 +1128,6 @@ var Collapse = function () {
var Selector = {
ACTIVES: '.show, .collapsing',
DATA_TOGGLE: '[data-toggle="collapse"]'
};
/**
* ------------------------------------------------------------------------
@@ -1137,6 +1135,7 @@ var Collapse = function () {
* ------------------------------------------------------------------------
*/
};
var Collapse = function () {
function Collapse(element, config) {
classCallCheck(this, Collapse);
@@ -1404,7 +1403,7 @@ var Collapse = function () {
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
// preventDefault only for <a> elements (which change the URL) not inside the collapsible element
if (event.target.tagName === 'A' && !$.contains(this, event.target)) {
if (event.currentTarget.tagName === 'A') {
event.preventDefault();
}
@@ -3951,7 +3950,6 @@ var Dropdown = function () {
var DefaultType = {
offset: '(number|string)',
flip: 'boolean'
};
/**
* ------------------------------------------------------------------------
@@ -3959,6 +3957,7 @@ var Dropdown = function () {
* ------------------------------------------------------------------------
*/
};
var Dropdown = function () {
function Dropdown(element, config) {
classCallCheck(this, Dropdown);
@@ -4102,10 +4101,9 @@ var Dropdown = function () {
enabled: this._config.flip
}
}
};
// Disable Popper.js for Dropdown in Navbar
if (this._inNavbar) {
};if (this._inNavbar) {
popperConfig.modifiers.applyStyle = {
enabled: !this._inNavbar
};
@@ -4358,7 +4356,6 @@ var Modal = function () {
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
STICKY_CONTENT: '.sticky-top',
NAVBAR_TOGGLER: '.navbar-toggler'
};
/**
* ------------------------------------------------------------------------
@@ -4366,6 +4363,7 @@ var Modal = function () {
* ------------------------------------------------------------------------
*/
};
var Modal = function () {
function Modal(element, config) {
classCallCheck(this, Modal);
@@ -4973,7 +4971,6 @@ var Tooltip = function () {
FOCUS: 'focus',
CLICK: 'click',
MANUAL: 'manual'
};
/**
* ------------------------------------------------------------------------
@@ -4981,6 +4978,7 @@ var Tooltip = function () {
* ------------------------------------------------------------------------
*/
};
var Tooltip = function () {
function Tooltip(element, config) {
classCallCheck(this, Tooltip);
@@ -5409,18 +5407,18 @@ var Tooltip = function () {
Tooltip.prototype._getConfig = function _getConfig(config) {
config = $.extend({}, this.constructor.Default, $(this.element).data(), config);
if (config.delay && typeof config.delay === 'number') {
if (typeof config.delay === 'number') {
config.delay = {
show: config.delay,
hide: config.delay
};
}
if (config.title && typeof config.title === 'number') {
if (typeof config.title === 'number') {
config.title = config.title.toString();
}
if (config.content && typeof config.content === 'number') {
if (typeof config.content === 'number') {
config.content = config.content.toString();
}
@@ -5604,7 +5602,6 @@ var Popover = function () {
FOCUSOUT: 'focusout' + EVENT_KEY,
MOUSEENTER: 'mouseenter' + EVENT_KEY,
MOUSELEAVE: 'mouseleave' + EVENT_KEY
};
/**
* ------------------------------------------------------------------------
@@ -5612,6 +5609,7 @@ var Popover = function () {
* ------------------------------------------------------------------------
*/
};
var Popover = function (_Tooltip) {
inherits(Popover, _Tooltip);
@@ -5803,7 +5801,6 @@ var ScrollSpy = function () {
var OffsetMethod = {
OFFSET: 'offset',
POSITION: 'position'
};
/**
* ------------------------------------------------------------------------
@@ -5811,6 +5808,7 @@ var ScrollSpy = function () {
* ------------------------------------------------------------------------
*/
};
var ScrollSpy = function () {
function ScrollSpy(element, config) {
var _this = this;
@@ -6104,7 +6102,6 @@ var Tab = function () {
DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
DROPDOWN_TOGGLE: '.dropdown-toggle',
DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
};
/**
* ------------------------------------------------------------------------
@@ -6112,6 +6109,7 @@ var Tab = function () {
* ------------------------------------------------------------------------
*/
};
var Tab = function () {
function Tab(element) {
classCallCheck(this, Tab);

File diff suppressed because one or more lines are too long

View File

@@ -34,10 +34,9 @@ var Util = function () {
MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend',
transition: 'transitionend'
};
// shoutout AngusCroll (https://goo.gl/pxwQGp)
function toType(obj) {
};function toType(obj) {
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
}
@@ -257,7 +256,6 @@ var Alert = function () {
ALERT: 'alert',
FADE: 'fade',
SHOW: 'show'
};
/**
* ------------------------------------------------------------------------
@@ -265,6 +263,7 @@ var Alert = function () {
* ------------------------------------------------------------------------
*/
};
var Alert = function () {
function Alert(element) {
classCallCheck(this, Alert);
@@ -437,7 +436,6 @@ var Button = function () {
var Event = {
CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
};
/**
* ------------------------------------------------------------------------
@@ -445,6 +443,7 @@ var Button = function () {
* ------------------------------------------------------------------------
*/
};
var Button = function () {
function Button(element) {
classCallCheck(this, Button);
@@ -646,7 +645,6 @@ var Carousel = function () {
INDICATORS: '.carousel-indicators',
DATA_SLIDE: '[data-slide], [data-slide-to]',
DATA_RIDE: '[data-ride="carousel"]'
};
/**
* ------------------------------------------------------------------------
@@ -654,6 +652,7 @@ var Carousel = function () {
* ------------------------------------------------------------------------
*/
};
var Carousel = function () {
function Carousel(element, config) {
classCallCheck(this, Carousel);
@@ -1130,7 +1129,6 @@ var Collapse = function () {
var Selector = {
ACTIVES: '.show, .collapsing',
DATA_TOGGLE: '[data-toggle="collapse"]'
};
/**
* ------------------------------------------------------------------------
@@ -1138,6 +1136,7 @@ var Collapse = function () {
* ------------------------------------------------------------------------
*/
};
var Collapse = function () {
function Collapse(element, config) {
classCallCheck(this, Collapse);
@@ -1405,7 +1404,7 @@ var Collapse = function () {
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
// preventDefault only for <a> elements (which change the URL) not inside the collapsible element
if (event.target.tagName === 'A' && !$.contains(this, event.target)) {
if (event.currentTarget.tagName === 'A') {
event.preventDefault();
}
@@ -1514,7 +1513,6 @@ var Dropdown = function () {
var DefaultType = {
offset: '(number|string)',
flip: 'boolean'
};
/**
* ------------------------------------------------------------------------
@@ -1522,6 +1520,7 @@ var Dropdown = function () {
* ------------------------------------------------------------------------
*/
};
var Dropdown = function () {
function Dropdown(element, config) {
classCallCheck(this, Dropdown);
@@ -1665,10 +1664,9 @@ var Dropdown = function () {
enabled: this._config.flip
}
}
};
// Disable Popper.js for Dropdown in Navbar
if (this._inNavbar) {
};if (this._inNavbar) {
popperConfig.modifiers.applyStyle = {
enabled: !this._inNavbar
};
@@ -1921,7 +1919,6 @@ var Modal = function () {
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
STICKY_CONTENT: '.sticky-top',
NAVBAR_TOGGLER: '.navbar-toggler'
};
/**
* ------------------------------------------------------------------------
@@ -1929,6 +1926,7 @@ var Modal = function () {
* ------------------------------------------------------------------------
*/
};
var Modal = function () {
function Modal(element, config) {
classCallCheck(this, Modal);
@@ -2536,7 +2534,6 @@ var Tooltip = function () {
FOCUS: 'focus',
CLICK: 'click',
MANUAL: 'manual'
};
/**
* ------------------------------------------------------------------------
@@ -2544,6 +2541,7 @@ var Tooltip = function () {
* ------------------------------------------------------------------------
*/
};
var Tooltip = function () {
function Tooltip(element, config) {
classCallCheck(this, Tooltip);
@@ -2972,18 +2970,18 @@ var Tooltip = function () {
Tooltip.prototype._getConfig = function _getConfig(config) {
config = $.extend({}, this.constructor.Default, $(this.element).data(), config);
if (config.delay && typeof config.delay === 'number') {
if (typeof config.delay === 'number') {
config.delay = {
show: config.delay,
hide: config.delay
};
}
if (config.title && typeof config.title === 'number') {
if (typeof config.title === 'number') {
config.title = config.title.toString();
}
if (config.content && typeof config.content === 'number') {
if (typeof config.content === 'number') {
config.content = config.content.toString();
}
@@ -3167,7 +3165,6 @@ var Popover = function () {
FOCUSOUT: 'focusout' + EVENT_KEY,
MOUSEENTER: 'mouseenter' + EVENT_KEY,
MOUSELEAVE: 'mouseleave' + EVENT_KEY
};
/**
* ------------------------------------------------------------------------
@@ -3175,6 +3172,7 @@ var Popover = function () {
* ------------------------------------------------------------------------
*/
};
var Popover = function (_Tooltip) {
inherits(Popover, _Tooltip);
@@ -3366,7 +3364,6 @@ var ScrollSpy = function () {
var OffsetMethod = {
OFFSET: 'offset',
POSITION: 'position'
};
/**
* ------------------------------------------------------------------------
@@ -3374,6 +3371,7 @@ var ScrollSpy = function () {
* ------------------------------------------------------------------------
*/
};
var ScrollSpy = function () {
function ScrollSpy(element, config) {
var _this = this;
@@ -3667,7 +3665,6 @@ var Tab = function () {
DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
DROPDOWN_TOGGLE: '.dropdown-toggle',
DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
};
/**
* ------------------------------------------------------------------------
@@ -3675,6 +3672,7 @@ var Tab = function () {
* ------------------------------------------------------------------------
*/
};
var Tab = function () {
function Tab(element) {
classCallCheck(this, Tab);

File diff suppressed because one or more lines are too long

2
js/dist/alert.js vendored
View File

@@ -41,7 +41,6 @@ var Alert = function () {
ALERT: 'alert',
FADE: 'fade',
SHOW: 'show'
};
/**
* ------------------------------------------------------------------------
@@ -49,6 +48,7 @@ var Alert = function () {
* ------------------------------------------------------------------------
*/
};
var Alert = function () {
function Alert(element) {
_classCallCheck(this, Alert);

File diff suppressed because one or more lines are too long

2
js/dist/button.js vendored
View File

@@ -43,7 +43,6 @@ var Button = function () {
var Event = {
CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
};
/**
* ------------------------------------------------------------------------
@@ -51,6 +50,7 @@ var Button = function () {
* ------------------------------------------------------------------------
*/
};
var Button = function () {
function Button(element) {
_classCallCheck(this, Button);

File diff suppressed because one or more lines are too long

2
js/dist/carousel.js vendored
View File

@@ -85,7 +85,6 @@ var Carousel = function () {
INDICATORS: '.carousel-indicators',
DATA_SLIDE: '[data-slide], [data-slide-to]',
DATA_RIDE: '[data-ride="carousel"]'
};
/**
* ------------------------------------------------------------------------
@@ -93,6 +92,7 @@ var Carousel = function () {
* ------------------------------------------------------------------------
*/
};
var Carousel = function () {
function Carousel(element, config) {
_classCallCheck(this, Carousel);

File diff suppressed because one or more lines are too long

4
js/dist/collapse.js vendored
View File

@@ -62,7 +62,6 @@ var Collapse = function () {
var Selector = {
ACTIVES: '.show, .collapsing',
DATA_TOGGLE: '[data-toggle="collapse"]'
};
/**
* ------------------------------------------------------------------------
@@ -70,6 +69,7 @@ var Collapse = function () {
* ------------------------------------------------------------------------
*/
};
var Collapse = function () {
function Collapse(element, config) {
_classCallCheck(this, Collapse);
@@ -353,7 +353,7 @@ var Collapse = function () {
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
// preventDefault only for <a> elements (which change the URL) not inside the collapsible element
if (event.target.tagName === 'A' && !$.contains(this, event.target)) {
if (event.currentTarget.tagName === 'A') {
event.preventDefault();
}

File diff suppressed because one or more lines are too long

5
js/dist/dropdown.js vendored
View File

@@ -85,7 +85,6 @@ var Dropdown = function () {
var DefaultType = {
offset: '(number|string)',
flip: 'boolean'
};
/**
* ------------------------------------------------------------------------
@@ -93,6 +92,7 @@ var Dropdown = function () {
* ------------------------------------------------------------------------
*/
};
var Dropdown = function () {
function Dropdown(element, config) {
_classCallCheck(this, Dropdown);
@@ -249,10 +249,9 @@ var Dropdown = function () {
enabled: this._config.flip
}
}
};
// Disable Popper.js for Dropdown in Navbar
if (this._inNavbar) {
};if (this._inNavbar) {
popperConfig.modifiers.applyStyle = {
enabled: !this._inNavbar
};

File diff suppressed because one or more lines are too long

2
js/dist/modal.js vendored
View File

@@ -74,7 +74,6 @@ var Modal = function () {
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
STICKY_CONTENT: '.sticky-top',
NAVBAR_TOGGLER: '.navbar-toggler'
};
/**
* ------------------------------------------------------------------------
@@ -82,6 +81,7 @@ var Modal = function () {
* ------------------------------------------------------------------------
*/
};
var Modal = function () {
function Modal(element, config) {
_classCallCheck(this, Modal);

File diff suppressed because one or more lines are too long

2
js/dist/popover.js vendored
View File

@@ -65,7 +65,6 @@ var Popover = function () {
FOCUSOUT: 'focusout' + EVENT_KEY,
MOUSEENTER: 'mouseenter' + EVENT_KEY,
MOUSELEAVE: 'mouseleave' + EVENT_KEY
};
/**
* ------------------------------------------------------------------------
@@ -73,6 +72,7 @@ var Popover = function () {
* ------------------------------------------------------------------------
*/
};
var Popover = function (_Tooltip) {
_inherits(Popover, _Tooltip);

File diff suppressed because one or more lines are too long

View File

@@ -66,7 +66,6 @@ var ScrollSpy = function () {
var OffsetMethod = {
OFFSET: 'offset',
POSITION: 'position'
};
/**
* ------------------------------------------------------------------------
@@ -74,6 +73,7 @@ var ScrollSpy = function () {
* ------------------------------------------------------------------------
*/
};
var ScrollSpy = function () {
function ScrollSpy(element, config) {
var _this = this;

File diff suppressed because one or more lines are too long

2
js/dist/tab.js vendored
View File

@@ -51,7 +51,6 @@ var Tab = function () {
DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
DROPDOWN_TOGGLE: '.dropdown-toggle',
DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
};
/**
* ------------------------------------------------------------------------
@@ -59,6 +58,7 @@ var Tab = function () {
* ------------------------------------------------------------------------
*/
};
var Tab = function () {
function Tab(element) {
_classCallCheck(this, Tab);

2
js/dist/tab.js.map vendored

File diff suppressed because one or more lines are too long

8
js/dist/tooltip.js vendored
View File

@@ -108,7 +108,6 @@ var Tooltip = function () {
FOCUS: 'focus',
CLICK: 'click',
MANUAL: 'manual'
};
/**
* ------------------------------------------------------------------------
@@ -116,6 +115,7 @@ var Tooltip = function () {
* ------------------------------------------------------------------------
*/
};
var Tooltip = function () {
function Tooltip(element, config) {
_classCallCheck(this, Tooltip);
@@ -569,18 +569,18 @@ var Tooltip = function () {
value: function _getConfig(config) {
config = $.extend({}, this.constructor.Default, $(this.element).data(), config);
if (config.delay && typeof config.delay === 'number') {
if (typeof config.delay === 'number') {
config.delay = {
show: config.delay,
hide: config.delay
};
}
if (config.title && typeof config.title === 'number') {
if (typeof config.title === 'number') {
config.title = config.title.toString();
}
if (config.content && typeof config.content === 'number') {
if (typeof config.content === 'number') {
config.content = config.content.toString();
}

File diff suppressed because one or more lines are too long

3
js/dist/util.js vendored
View File

@@ -24,10 +24,9 @@ var Util = function () {
MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend',
transition: 'transitionend'
};
// shoutout AngusCroll (https://goo.gl/pxwQGp)
function toType(obj) {
};function toType(obj) {
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
}

2
js/dist/util.js.map vendored

File diff suppressed because one or more lines are too long

2307
package-lock.json generated

File diff suppressed because it is too large Load Diff