From bb3d3e54265e0192661fb54f708342341b9bbd2d Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 17 Apr 2018 10:36:18 -0500
Subject: Fix tooltips

---
 app/assets/javascripts/commons/bootstrap.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'app/assets/javascripts/commons/bootstrap.js')

diff --git a/app/assets/javascripts/commons/bootstrap.js b/app/assets/javascripts/commons/bootstrap.js
index db96da4ccba..114a3cb872a 100644
--- a/app/assets/javascripts/commons/bootstrap.js
+++ b/app/assets/javascripts/commons/bootstrap.js
@@ -1,18 +1,15 @@
 import $ from 'jquery';
 
+import Popper from 'popper.js/dist/umd/popper';
+
 // bootstrap jQuery plugins
-import 'bootstrap-sass/assets/javascripts/bootstrap/affix';
-import 'bootstrap-sass/assets/javascripts/bootstrap/alert';
-import 'bootstrap-sass/assets/javascripts/bootstrap/button';
-import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown';
-import 'bootstrap-sass/assets/javascripts/bootstrap/modal';
-import 'bootstrap-sass/assets/javascripts/bootstrap/tab';
-import 'bootstrap-sass/assets/javascripts/bootstrap/transition';
-import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
-import 'bootstrap-sass/assets/javascripts/bootstrap/popover';
+import 'bootstrap/dist/js/bootstrap.bundle';
 
 // custom jQuery functions
 $.fn.extend({
   disable() { return $(this).prop('disabled', true).addClass('disabled'); },
   enable() { return $(this).prop('disabled', false).removeClass('disabled'); },
 });
+
+// Enable Bootstrap tooltips
+$('[data-toggle="tooltip"]').tooltip();
-- 
cgit v1.2.1