aboutsummaryrefslogtreecommitdiff
path: root/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-31 21:25:47 -0700
committerMark Otto <[email protected]>2017-05-31 21:25:47 -0700
commit620257456ed0685cae6b6ff51d2ab1e37f02a4fa (patch)
tree7449007c76a05589f60c74d9dd583d9bcf7f46a1 /dist/js/bootstrap.js
parent332d882cdbb541f1f6d5b781b1454f84bb0c8ad2 (diff)
downloadbootstrap-620257456ed0685cae6b6ff51d2ab1e37f02a4fa.tar.xz
bootstrap-620257456ed0685cae6b6ff51d2ab1e37f02a4fa.zip
build
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r--dist/js/bootstrap.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 3b5aff522..4048449a0 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -2981,7 +2981,7 @@ var Tooltip = function ($) {
var Default = {
animation: true,
- template: '<div class="tooltip" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<div class="tooltip-inner"></div></div>',
+ template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
trigger: 'hover focus',
title: '',
delay: 0,
@@ -3018,7 +3018,8 @@ var Tooltip = function ($) {
var Selector = {
TOOLTIP: '.tooltip',
- TOOLTIP_INNER: '.tooltip-inner'
+ TOOLTIP_INNER: '.tooltip-inner',
+ ARROW: '.arrow'
};
var Trigger = {
@@ -3175,6 +3176,9 @@ var Tooltip = function ($) {
},
flip: {
behavior: this.config.fallbackPlacement
+ },
+ arrow: {
+ element: Selector.ARROW
}
},
onCreate: function onCreate(data) {
@@ -3621,7 +3625,7 @@ var Popover = function ($) {
placement: 'right',
trigger: 'click',
content: '',
- template: '<div class="popover" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
+ template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
});
var DefaultType = $.extend({}, Tooltip.DefaultType, {