From 81e07ec05218d75d64454787449dcb870b5b66ec Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Fri, 7 Apr 2017 11:12:17 +0200
Subject: Begin to add arrow to Popover and Tooltip

---
 js/src/tooltip.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'js/src/tooltip.js')

diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index c4c4ee2f6..505a8d492 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -37,6 +37,7 @@ const Tooltip = (($) => {
   const Default = {
     animation   : true,
     template    : '<div class="tooltip" role="tooltip">'
+                + '<div class="arrow"></div>'
                 + '<div class="tooltip-inner"></div></div>',
     trigger     : 'hover focus',
     title       : '',
@@ -281,10 +282,8 @@ const Tooltip = (($) => {
 
         this._popper = new Popper(this.element, tip, {
           placement : attachment,
+          arrowElement : '.arrow',
           modifiers : {
-            arrow : {
-              element : Selector.TOOLTIP
-            },
             offset : {
               offset : this.config.offset
             }
@@ -335,7 +334,10 @@ const Tooltip = (($) => {
 
         this.element.removeAttribute('aria-describedby')
         $(this.element).trigger(this.constructor.Event.HIDDEN)
-        this._popper.destroy()
+        if (this._popper !== null) {
+          this._popper.destroy()
+        }
+
         if (callback) {
           callback()
         }
-- 
cgit v1.2.3