mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
build
This commit is contained in:
parent
c8c51186f5
commit
4282d892f3
11 changed files with 81 additions and 23 deletions
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css.map
vendored
2
dist/css/bootstrap.min.css.map
vendored
File diff suppressed because one or more lines are too long
|
@ -1428,7 +1428,10 @@ var Dropdown = function ($) {
|
||||||
|
|
||||||
var ClassName = {
|
var ClassName = {
|
||||||
DISABLED: 'disabled',
|
DISABLED: 'disabled',
|
||||||
SHOW: 'show'
|
SHOW: 'show',
|
||||||
|
DROPUP: 'dropup',
|
||||||
|
MENURIGHT: 'dropdown-menu-right',
|
||||||
|
MENULEFT: 'dropdown-menu-left'
|
||||||
};
|
};
|
||||||
|
|
||||||
var Selector = {
|
var Selector = {
|
||||||
|
@ -1441,7 +1444,9 @@ var Dropdown = function ($) {
|
||||||
|
|
||||||
var AttachmentMap = {
|
var AttachmentMap = {
|
||||||
TOP: 'top-start',
|
TOP: 'top-start',
|
||||||
BOTTOM: 'bottom-start'
|
TOPEND: 'top-end',
|
||||||
|
BOTTOM: 'bottom-start',
|
||||||
|
BOTTOMEND: 'bottom-end'
|
||||||
};
|
};
|
||||||
|
|
||||||
var Default = {
|
var Default = {
|
||||||
|
@ -1503,10 +1508,15 @@ var Dropdown = function ($) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle dropup
|
var element = this._element;
|
||||||
var dropdownPlacement = $(this._element).parent().hasClass('dropup') ? AttachmentMap.TOP : this._config.placement;
|
// for dropup with alignment we use the parent as popper container
|
||||||
this._popper = new Popper(this._element, this._menu, {
|
if ($(parent).hasClass(ClassName.DROPUP)) {
|
||||||
placement: dropdownPlacement,
|
if ($(this._menu).hasClass(ClassName.MENULEFT) || $(this._menu).hasClass(ClassName.MENURIGHT)) {
|
||||||
|
element = parent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._popper = new Popper(element, this._menu, {
|
||||||
|
placement: this._getPlacement(),
|
||||||
modifiers: {
|
modifiers: {
|
||||||
offset: {
|
offset: {
|
||||||
offset: this._config.offset
|
offset: this._config.offset
|
||||||
|
@ -1582,6 +1592,24 @@ var Dropdown = function ($) {
|
||||||
return this._menu;
|
return this._menu;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Dropdown.prototype._getPlacement = function _getPlacement() {
|
||||||
|
var $parentDropdown = $(this._element).parent();
|
||||||
|
var placement = this._config.placement;
|
||||||
|
|
||||||
|
// Handle dropup
|
||||||
|
if ($parentDropdown.hasClass(ClassName.DROPUP) || this._config.placement === AttachmentMap.TOP) {
|
||||||
|
placement = AttachmentMap.TOP;
|
||||||
|
if ($(this._menu).hasClass(ClassName.MENURIGHT)) {
|
||||||
|
placement = AttachmentMap.TOPEND;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if ($(this._menu).hasClass(ClassName.MENURIGHT)) {
|
||||||
|
placement = AttachmentMap.BOTTOMEND;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
};
|
||||||
|
|
||||||
// static
|
// static
|
||||||
|
|
||||||
Dropdown._jQueryInterface = function _jQueryInterface(config) {
|
Dropdown._jQueryInterface = function _jQueryInterface(config) {
|
||||||
|
@ -2944,6 +2972,7 @@ var Tooltip = function ($) {
|
||||||
};
|
};
|
||||||
|
|
||||||
var AttachmentMap = {
|
var AttachmentMap = {
|
||||||
|
AUTO: 'auto',
|
||||||
TOP: 'top',
|
TOP: 'top',
|
||||||
RIGHT: 'right',
|
RIGHT: 'right',
|
||||||
BOTTOM: 'bottom',
|
BOTTOM: 'bottom',
|
||||||
|
@ -2952,7 +2981,7 @@ var Tooltip = function ($) {
|
||||||
|
|
||||||
var Default = {
|
var Default = {
|
||||||
animation: true,
|
animation: true,
|
||||||
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
|
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<div class="tooltip-inner"></div></div>',
|
||||||
trigger: 'hover focus',
|
trigger: 'hover focus',
|
||||||
title: '',
|
title: '',
|
||||||
delay: 0,
|
delay: 0,
|
||||||
|
@ -3592,7 +3621,7 @@ var Popover = function ($) {
|
||||||
placement: 'right',
|
placement: 'right',
|
||||||
trigger: 'click',
|
trigger: 'click',
|
||||||
content: '',
|
content: '',
|
||||||
template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
|
template: '<div class="popover" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
|
||||||
});
|
});
|
||||||
|
|
||||||
var DefaultType = $.extend({}, Tooltip.DefaultType, {
|
var DefaultType = $.extend({}, Tooltip.DefaultType, {
|
||||||
|
|
2
docs/assets/css/docs.min.css
vendored
2
docs/assets/css/docs.min.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
40
js/dist/dropdown.js
vendored
40
js/dist/dropdown.js
vendored
|
@ -54,7 +54,10 @@ var Dropdown = function ($) {
|
||||||
|
|
||||||
var ClassName = {
|
var ClassName = {
|
||||||
DISABLED: 'disabled',
|
DISABLED: 'disabled',
|
||||||
SHOW: 'show'
|
SHOW: 'show',
|
||||||
|
DROPUP: 'dropup',
|
||||||
|
MENURIGHT: 'dropdown-menu-right',
|
||||||
|
MENULEFT: 'dropdown-menu-left'
|
||||||
};
|
};
|
||||||
|
|
||||||
var Selector = {
|
var Selector = {
|
||||||
|
@ -67,7 +70,9 @@ var Dropdown = function ($) {
|
||||||
|
|
||||||
var AttachmentMap = {
|
var AttachmentMap = {
|
||||||
TOP: 'top-start',
|
TOP: 'top-start',
|
||||||
BOTTOM: 'bottom-start'
|
TOPEND: 'top-end',
|
||||||
|
BOTTOM: 'bottom-start',
|
||||||
|
BOTTOMEND: 'bottom-end'
|
||||||
};
|
};
|
||||||
|
|
||||||
var Default = {
|
var Default = {
|
||||||
|
@ -129,10 +134,15 @@ var Dropdown = function ($) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle dropup
|
var element = this._element;
|
||||||
var dropdownPlacement = $(this._element).parent().hasClass('dropup') ? AttachmentMap.TOP : this._config.placement;
|
// for dropup with alignment we use the parent as popper container
|
||||||
this._popper = new Popper(this._element, this._menu, {
|
if ($(parent).hasClass(ClassName.DROPUP)) {
|
||||||
placement: dropdownPlacement,
|
if ($(this._menu).hasClass(ClassName.MENULEFT) || $(this._menu).hasClass(ClassName.MENURIGHT)) {
|
||||||
|
element = parent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._popper = new Popper(element, this._menu, {
|
||||||
|
placement: this._getPlacement(),
|
||||||
modifiers: {
|
modifiers: {
|
||||||
offset: {
|
offset: {
|
||||||
offset: this._config.offset
|
offset: this._config.offset
|
||||||
|
@ -208,6 +218,24 @@ var Dropdown = function ($) {
|
||||||
return this._menu;
|
return this._menu;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Dropdown.prototype._getPlacement = function _getPlacement() {
|
||||||
|
var $parentDropdown = $(this._element).parent();
|
||||||
|
var placement = this._config.placement;
|
||||||
|
|
||||||
|
// Handle dropup
|
||||||
|
if ($parentDropdown.hasClass(ClassName.DROPUP) || this._config.placement === AttachmentMap.TOP) {
|
||||||
|
placement = AttachmentMap.TOP;
|
||||||
|
if ($(this._menu).hasClass(ClassName.MENURIGHT)) {
|
||||||
|
placement = AttachmentMap.TOPEND;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if ($(this._menu).hasClass(ClassName.MENURIGHT)) {
|
||||||
|
placement = AttachmentMap.BOTTOMEND;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
};
|
||||||
|
|
||||||
// static
|
// static
|
||||||
|
|
||||||
Dropdown._jQueryInterface = function _jQueryInterface(config) {
|
Dropdown._jQueryInterface = function _jQueryInterface(config) {
|
||||||
|
|
2
js/dist/dropdown.js.map
vendored
2
js/dist/dropdown.js.map
vendored
File diff suppressed because one or more lines are too long
2
js/dist/popover.js
vendored
2
js/dist/popover.js
vendored
|
@ -35,7 +35,7 @@ var Popover = function ($) {
|
||||||
placement: 'right',
|
placement: 'right',
|
||||||
trigger: 'click',
|
trigger: 'click',
|
||||||
content: '',
|
content: '',
|
||||||
template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
|
template: '<div class="popover" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
|
||||||
});
|
});
|
||||||
|
|
||||||
var DefaultType = $.extend({}, Tooltip.DefaultType, {
|
var DefaultType = $.extend({}, Tooltip.DefaultType, {
|
||||||
|
|
2
js/dist/popover.js.map
vendored
2
js/dist/popover.js.map
vendored
File diff suppressed because one or more lines are too long
3
js/dist/tooltip.js
vendored
3
js/dist/tooltip.js
vendored
|
@ -51,6 +51,7 @@ var Tooltip = function ($) {
|
||||||
};
|
};
|
||||||
|
|
||||||
var AttachmentMap = {
|
var AttachmentMap = {
|
||||||
|
AUTO: 'auto',
|
||||||
TOP: 'top',
|
TOP: 'top',
|
||||||
RIGHT: 'right',
|
RIGHT: 'right',
|
||||||
BOTTOM: 'bottom',
|
BOTTOM: 'bottom',
|
||||||
|
@ -59,7 +60,7 @@ var Tooltip = function ($) {
|
||||||
|
|
||||||
var Default = {
|
var Default = {
|
||||||
animation: true,
|
animation: true,
|
||||||
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
|
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<div class="tooltip-inner"></div></div>',
|
||||||
trigger: 'hover focus',
|
trigger: 'hover focus',
|
||||||
title: '',
|
title: '',
|
||||||
delay: 0,
|
delay: 0,
|
||||||
|
|
2
js/dist/tooltip.js.map
vendored
2
js/dist/tooltip.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue