Keybind all of _uniq([t(sidebar.key), '`', '²']) to toggle sidebar

(closes #5663)
openstreetmap · Jan 6, 2019 · 55d2ddd · 55d2ddd
1 parent 5567b2b
commit 55d2ddd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/modules/ui/init.js b/modules/ui/init.js
@@ -1,3 +1,5 @@
+import _uniq from 'lodash-es/uniq';
+
 import {
     event as d3_event,
     select as d3_select
@@ -298,9 +300,10 @@ export function uiInit(context) {
 
 
         var panPixels = 80;
+        var sidebarKeys = _uniq([t('sidebar.key'), '`', '²']);  // #5663
         context.keybinding()
             .on('⌫', function() { d3_event.preventDefault(); })
-            .on(t('sidebar.key'), ui.sidebar.toggle)
+            .on(sidebarKeys, ui.sidebar.toggle)
             .on('←', pan([panPixels, 0]))
             .on('↑', pan([0, panPixels]))
             .on('→', pan([-panPixels, 0]))

diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js
@@ -1,3 +1,5 @@
+import _uniq from 'lodash-es/uniq';
+
 import {
     select as d3_select,
     selectAll as d3_selectAll
@@ -177,6 +179,8 @@ export function uiShortcuts(context) {
                     arr = ['Y'];
                 } else if (detected.os !== 'mac' && d.text === 'shortcuts.browsing.display_options.fullscreen') {
                     arr = ['F11'];
+                } else if (d.text === 'shortcuts.browsing.display_options.sidebar') {
+                    arr = _uniq([t('sidebar.key'), '`', '²']);   // #5663
                 }
 
                 return arr.map(function(s) {