Skip to content

Commit 46ad924

Browse files
authored
Merge pull request #851 from amatsuda/bs5_tooltip
Globally initialize tooltips by Bootstrap 5
2 parents 8627884 + 7be80e1 commit 46ad924

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

app/javascript/application.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ import * as Popper from "@popperjs/core"
44
import * as bootstrap from "bootstrap"
55
import "chartkick/chart.js"
66

7-
// Initialize Bootstrap dropdowns
7+
// Initialize Bootstrap components
88
document.addEventListener('DOMContentLoaded', () => {
99
document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach(el => {
1010
new bootstrap.Dropdown(el)
1111
})
12+
document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach(el => {
13+
new bootstrap.Tooltip(el)
14+
})
1215
})
1316

1417
import "@hotwired/turbo-rails"

app/javascript/controllers/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import TimeSlotFormResetController from "./time_slot_form_reset_controller"
5757
import TimeSlotsController from "./time_slots_controller"
5858
import ToggleVisibilityController from "./toggle_visibility_controller"
5959
import TomSelectController from "./tom_select_controller"
60-
import TooltipController from "./tooltip_controller"
6160
import TrackFilterController from "./track_filter_controller"
6261

6362
application.register("alert-autodismiss", AlertAutodismissController)
@@ -108,5 +107,4 @@ application.register("time-slot-form-reset", TimeSlotFormResetController)
108107
application.register("time-slots", TimeSlotsController)
109108
application.register("toggle-visibility", ToggleVisibilityController)
110109
application.register("tom-select", TomSelectController)
111-
application.register("tooltip", TooltipController)
112110
application.register("track-filter", TrackFilterController)

app/javascript/controllers/tooltip_controller.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

config/initializers/simple_form/tooltip_component.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ module Components
33
module Tooltips
44
def tooltip(wrapper_options = nil)
55
unless tooltip_text.nil?
6-
input_html_options[:rel] ||= 'tooltip'
7-
input_html_options['data-controller'] ||= 'tooltip'
86
input_html_options['data-bs-toggle'] ||= 'tooltip'
97
input_html_options['data-bs-placement'] ||= tooltip_position
108
input_html_options['data-bs-trigger'] ||= 'hover focus'

0 commit comments

Comments
 (0)