diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-06-01 20:16:17 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-06-01 20:16:17 +0300 |
commit | e92f95fb42ab938fd6f4d59e7b3b243e297ef58f (patch) | |
tree | 780e524de7949337515dec87ff804d51b0f8ecfb /assets/javascripts/bootstrap | |
parent | d1e4e696b7fefcaec458aa6ab8f31411172011d6 (diff) |
rake update[v4-dev]
Diffstat (limited to 'assets/javascripts/bootstrap')
-rw-r--r-- | assets/javascripts/bootstrap/popover.js | 2 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js index b0249ed..b5fe8a2 100644 --- a/assets/javascripts/bootstrap/popover.js +++ b/assets/javascripts/bootstrap/popover.js @@ -35,7 +35,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, { diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 2438f37..116a5cc 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -60,7 +60,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, @@ -97,7 +97,8 @@ var Tooltip = function ($) { var Selector = { TOOLTIP: '.tooltip', - TOOLTIP_INNER: '.tooltip-inner' + TOOLTIP_INNER: '.tooltip-inner', + ARROW: '.arrow' }; var Trigger = { @@ -254,6 +255,9 @@ var Tooltip = function ($) { }, flip: { behavior: this.config.fallbackPlacement + }, + arrow: { + element: Selector.ARROW } }, onCreate: function onCreate(data) { |