From 0bf8411edd14a07841b7dbc10fd5b41f624f0cfa Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 4 Jun 2017 08:26:52 -0400 Subject: [PATCH] Fix display of windows redo shortcut --- modules/ui/shortcuts.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js index ec013b97b..c5ef9a8db 100644 --- a/modules/ui/shortcuts.js +++ b/modules/ui/shortcuts.js @@ -6,13 +6,16 @@ import { dataShortcuts } from '../../data'; import { svgIcon } from '../svg'; import { uiCmd } from './cmd'; import { uiModal } from './modal'; +import { utilDetect } from '../util/detect'; export function uiShortcuts() { + var detected = utilDetect(); var activeTab = 0; var modalSelection; var savedSelection; + var keybinding = d3keybinding('shortcuts') .on(['?', '⇧/'], function () { if (modalSelection) { @@ -141,7 +144,13 @@ export function uiShortcuts() { modifierKeys .selectAll('kbd.modifier') - .data(function (d) { return d.modifiers; }) + .data(function (d) { + if (detected.os === 'win' && d.text === 'shortcuts.editing.commands.redo') { + return ['⌘']; + } else { + return d.modifiers; + } + }) .enter() .each(function () { var selection = d3.select(this); @@ -160,6 +169,14 @@ export function uiShortcuts() { shortcutKeys .selectAll('kbd.shortcut') .data(function (d) { + var arr; + if (detected.os === 'win' && d.text === 'shortcuts.editing.commands.redo') { + return [{ + shortcut: 'Y', + separator: d.separator + }]; + } + return d.shortcuts.map(function(s) { return { shortcut: s,