diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 10:36:18 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 10:36:18 -0500 |
| commit | bb3d3e54265e0192661fb54f708342341b9bbd2d (patch) | |
| tree | d7864ec70e5a1f8f7e4281ca0427e9f5b09d49fe /app/assets/javascripts/commons | |
| parent | ceb9f767db4dde2221dbb31ff8c8aa52a980fce2 (diff) | |
| download | gitlab-ce-bb3d3e54265e0192661fb54f708342341b9bbd2d.tar.gz | |
Fix tooltips
Diffstat (limited to 'app/assets/javascripts/commons')
| -rw-r--r-- | app/assets/javascripts/commons/bootstrap.js | 15 |
1 files changed, 6 insertions, 9 deletions
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(); |