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

Merge pull request #1785 from umap-project/fix-modifier-macos

Browse source 
fix: deal with the modifier key under macOS
This commit is contained in:
Yohan Boniface 2024-05-01 17:51:58 +02:00 committed by GitHub
commit 85e2a8ef5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
umap/static/umap/js/umap.controls.js
View file

@ -392,7 +392,7 @@ U.EditControl = L.Control.extend({
'mouseover', 'mouseover',
function () { function () {
map.ui.tooltip({ map.ui.tooltip({
content: `${L._('Switch to edit mode')} (<kbd>Ctrl+E</kbd>)`, content: map.help.displayLabel('TOGGLE_EDIT'),
anchor: enableEditing, anchor: enableEditing,
position: 'bottom', position: 'bottom',
delay: 750, delay: 750,

8
umap/static/umap/js/umap.core.js
View file

@ -321,6 +321,14 @@ U.Help = L.Class.extend({
shortcut: 'Modifier+S', shortcut: 'Modifier+S',
label: L._('Save current edits'), label: L._('Save current edits'),
}, },
EDIT_FEATURE_LAYER: {
shortcut: 'Modifier+⇧+Click',
label: L._("Edit feature's layer"),
},
CONTINUE_LINE: {
shortcut: 'Modifier+Click',
label: L._('Continue line'),
},
}, },
displayLabel: function (action, withKbdTag = true) { displayLabel: function (action, withKbdTag = true) {

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

@ -448,7 +448,7 @@ U.FeatureMixin = {
} }
items = items.concat( items = items.concat(
{ {
text: L._("Edit feature's layer") + ' (Ctrl+⇧+Click)', text: this.map.help.displayLabel('EDIT_FEATURE_LAYER'),
callback: this.datalayer.edit, callback: this.datalayer.edit,
context: this.datalayer, context: this.datalayer,
iconCls: 'umap-edit', iconCls: 'umap-edit',
@ -1055,7 +1055,7 @@ U.Polyline = L.Polyline.extend({
}) })
} else if (index === 0 || index === e.vertex.getLastIndex()) { } else if (index === 0 || index === e.vertex.getLastIndex()) {
items.push({ items.push({
text: L._('Continue line (Ctrl+Click)'), text: this.map.help.displayLabel('CONTINUE_LINE'),
callback: e.vertex.continue, callback: e.vertex.continue,
context: e.vertex.continue, context: e.vertex.continue,
}) })

6
umap/tests/integration/test_import.py
View file

@ -1,4 +1,5 @@
import json import json
import platform
import re import re
from pathlib import Path from pathlib import Path
from time import sleep from time import sleep
@ -13,7 +14,8 @@ pytestmark = pytest.mark.django_db
def test_layers_list_is_updated(live_server, tilelayer, page): def test_layers_list_is_updated(live_server, tilelayer, page):
page.goto(f"{live_server.url}/map/new/") page.goto(f"{live_server.url}/map/new/")
page.get_by_role("link", name="Import data (Ctrl+I)").click() modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl"
page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
# Should work # Should work
page.get_by_label("Choose the layer to import").select_option( page.get_by_label("Choose the layer to import").select_option(
label="Import in a new layer" label="Import in a new layer"
@ -22,7 +24,7 @@ def test_layers_list_is_updated(live_server, tilelayer, page):
page.get_by_role("button", name="Add a layer").click() page.get_by_role("button", name="Add a layer").click()
page.locator('input[name="name"]').click() page.locator('input[name="name"]').click()
page.locator('input[name="name"]').fill("foobar") page.locator('input[name="name"]').fill("foobar")
page.get_by_role("link", name="Import data (Ctrl+I)").click() page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
# Should still work # Should still work
page.get_by_label("Choose the layer to import").select_option( page.get_by_label("Choose the layer to import").select_option(
label="Import in a new layer" label="Import in a new layer"