almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-28 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: remove DomEvent import from umap.js

Browse source
This commit is contained in:
Yohan Boniface 2024-11-12 11:23:18 +01:00
parent c952fed96a
commit 55f04a2f10
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
umap/static/umap/js/modules/umap.js
View file

@ -1,4 +1,4 @@
import { DomUtil, DomEvent } from '../../vendors/leaflet/leaflet-src.esm.js' import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
import { translate, setLocale, getLocale } from './i18n.js' import { translate, setLocale, getLocale } from './i18n.js'
import * as Utils from './utils.js' import * as Utils from './utils.js'
import { ServerStored } from './saving.js' import { ServerStored } from './saving.js'
@ -407,6 +407,10 @@ export default class Umap extends ServerStored {
} }
} }
search() {
if (this._leafletMap._controls.search) this._leafletMap._controls.search.open()
}
hasEditMode() { hasEditMode() {
const editMode = this.properties.editMode const editMode = this.properties.editMode
return editMode === 'simple' || editMode === 'advanced' return editMode === 'simple' || editMode === 'advanced'
@ -450,8 +454,8 @@ export default class Umap extends ServerStored {
} }
initShortcuts() { initShortcuts() {
const globalShortcuts = function (e) { const globalShortcuts = (event) => {
if (e.key === 'Escape') { if (event.key === 'Escape') {
if (this.importer.dialog.visible) { if (this.importer.dialog.visible) {
this.importer.dialog.close() this.importer.dialog.close()
} else if (this.editEnabled && this._leafletMap.editTools.drawing()) { } else if (this.editEnabled && this._leafletMap.editTools.drawing()) {
@ -468,10 +472,11 @@ export default class Umap extends ServerStored {
} }
// From now on, only ctrl/meta shortcut // From now on, only ctrl/meta shortcut
if (!(e.ctrlKey || e.metaKey) || e.shiftKey) return if (!(event.ctrlKey || event.metaKey) || event.shiftKey) return
if (e.key === 'f') { if (event.key === 'f') {
L.DomEvent.stop(e) event.stopPropagation()
event.preventDefault()
this.search() this.search()
} }
@ -480,9 +485,10 @@ export default class Umap extends ServerStored {
// Edit mode Off // Edit mode Off
if (!this.editEnabled) { if (!this.editEnabled) {
switch (e.key) { switch (event.key) {
case 'e': case 'e':
L.DomEvent.stop(e) event.stopPropagation()
event.preventDefault()
this.enableEdit() this.enableEdit()
break break
} }
@ -491,7 +497,7 @@ export default class Umap extends ServerStored {
// Edit mode on // Edit mode on
let used = true let used = true
switch (e.key) { switch (event.key) {
case 'e': case 'e':
if (!SAVEMANAGER.isDirty) this.disableEdit() if (!SAVEMANAGER.isDirty) this.disableEdit()
break break
@ -522,9 +528,12 @@ export default class Umap extends ServerStored {
default: default:
used = false used = false
} }
if (used) DomEvent.stop(e) if (used) {
event.stopPropagation()
event.preventDefault()
}
} }
DomEvent.addListener(document, 'keydown', globalShortcuts, this) document.addEventListener('keydown', globalShortcuts)
} }
async initDataLayers(datalayers) { async initDataLayers(datalayers) {

4
umap/static/umap/js/umap.js
View file

@ -212,8 +212,4 @@ U.Map = L.Map.extend({
} }
}, },
search: function () {
if (this._controls.search) this._controls.search.open()
},
}) })