Skip to content

Commit 6b70a63

Browse files
committed
drop unneeded closeTooltips method
1 parent d19e0d6 commit 6b70a63

3 files changed

Lines changed: 3 additions & 13 deletions

File tree

app/javascript/controllers/map/layers_controller.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export default class extends Controller {
204204

205205
toggleLayerVisibility (event) {
206206
event.preventDefault()
207-
dom.closeTooltips()
207+
dom.initTooltips()
208208
const layerElement = event.target.closest('.layer-item')
209209
const layerId = layerElement.getAttribute('data-layer-id')
210210
const layer = layers.find(l => l.id === layerId)
@@ -292,7 +292,6 @@ export default class extends Controller {
292292
deleteLayer (event) {
293293
event.preventDefault()
294294
if (!confirm('Really delete this layer?')) { return }
295-
dom.closeTooltips()
296295
const layerElement = event.target.closest('.layer-item')
297296
const layerId = layerElement.getAttribute('data-layer-id')
298297
const layer = layers.find(f => f.id === layerId)

app/javascript/helpers/dom.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function animateElement (selector, effect = 'fade-in', delay = 0) {
4444
})
4545
}
4646

47-
// initialize bs5 tooltips
47+
// (re-)initialize bs5 tooltips
4848
export function initTooltips (root = document) {
4949
if (!functions.isTouchDevice()) {
5050
root.querySelectorAll('[data-toggle="tooltip"]').forEach(element => {
@@ -57,13 +57,6 @@ export function initTooltips (root = document) {
5757
}
5858
}
5959

60-
export function closeTooltips (root = document) {
61-
root.querySelectorAll('[data-toggle="tooltip"]').forEach(e => {
62-
const tooltip = bootstrap.Tooltip.getInstance(e)
63-
if (tooltip) tooltip.dispose()
64-
})
65-
}
66-
6760
export function scrollToId(elementId) {
6861
const element = document.getElementById(elementId)
6962
if (element) {

app/javascript/maplibre/controls/shared.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export function initSettingsModal () {
175175
// create the list of layers + features
176176
export function initLayersModal () {
177177
functions.e('#layers', e => {
178-
dom.closeTooltips(e)
178+
dom.initTooltips(e)
179179
e.innerHTML = ''
180180
const template = document.querySelector('#layer-item-template')
181181
layers.forEach(layer => {
@@ -289,8 +289,6 @@ export function resetControls () {
289289
functions.e('.modal-center', e => { e.classList.remove('show') })
290290
// reset context menu
291291
hideContextMenu()
292-
// reset open tooltips
293-
dom.closeTooltips()
294292
// re-initialize tooltips for map controls
295293
dom.initTooltips()
296294
}

0 commit comments

Comments
 (0)