jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1834 from umap-project/modifier-shift

Browse source 
fix: do not consider shortcuts if shift is also pressed
This commit is contained in:
Yohan Boniface 2024-05-17 17:04:05 +02:00 committed by GitHub
commit aa67d6d09d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
umap/static/umap/js/umap.js
View file

@ -511,11 +511,11 @@ U.Map = L.Map.extend({
initShortcuts: function () { initShortcuts: function () {
const globalShortcuts = function (e) { const globalShortcuts = function (e) {
const key = e.keyCode, const key = e.keyCode
modifierKey = e.ctrlKey || e.metaKey const hasModifier = (e.ctrlKey || e.metaKey) && !e.shiftKey
/* Generic shortcuts */ /* Generic shortcuts */
if (key === U.Keys.F && modifierKey) { if (key === U.Keys.F && hasModifier) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.search() this.search()
} else if (e.keyCode === U.Keys.ESC) { } else if (e.keyCode === U.Keys.ESC) {
@ -531,44 +531,44 @@ U.Map = L.Map.extend({
if (!this.hasEditMode()) return if (!this.hasEditMode()) return
/* Edit mode only shortcuts */ /* Edit mode only shortcuts */
if (key === U.Keys.E && modifierKey && !this.editEnabled) { if (key === U.Keys.E && hasModifier && !this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.enableEdit() this.enableEdit()
} else if (key === U.Keys.E && modifierKey && this.editEnabled && !this.isDirty) { } else if (key === U.Keys.E && hasModifier && this.editEnabled && !this.isDirty) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.disableEdit() this.disableEdit()
} }
if (key === U.Keys.S && modifierKey) { if (key === U.Keys.S && hasModifier) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
if (this.isDirty) { if (this.isDirty) {
this.save() this.save()
} }
} }
if (key === U.Keys.Z && modifierKey && this.isDirty) { if (key === U.Keys.Z && hasModifier && this.isDirty) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.askForReset() this.askForReset()
} }
if (key === U.Keys.M && modifierKey && this.editEnabled) { if (key === U.Keys.M && hasModifier && this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.editTools.startMarker() this.editTools.startMarker()
} }
if (key === U.Keys.P && modifierKey && this.editEnabled) { if (key === U.Keys.P && hasModifier && this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.editTools.startPolygon() this.editTools.startPolygon()
} }
if (key === U.Keys.L && modifierKey && this.editEnabled) { if (key === U.Keys.L && hasModifier && this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.editTools.startPolyline() this.editTools.startPolyline()
} }
if (key === U.Keys.I && modifierKey && this.editEnabled) { if (key === U.Keys.I && hasModifier && this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.importer.open() this.importer.open()
} }
if (key === U.Keys.O && modifierKey && this.editEnabled) { if (key === U.Keys.O && hasModifier && this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.importer.openFiles() this.importer.openFiles()
} }
if (key === U.Keys.H && modifierKey && this.editEnabled) { if (key === U.Keys.H && hasModifier && this.editEnabled) {
L.DomEvent.stop(e) L.DomEvent.stop(e)
this.help.show('edit') this.help.show('edit')
} }