From 33be372bf227e9334bbbcedd1aa29ec9cb82e3be Mon Sep 17 00:00:00 2001 From: David Minnix Date: Sat, 28 Mar 2020 12:50:37 -0400 Subject: [PATCH] xinniw - changed ^R to ^Enter for run command to reduce potential conflict with reload --- index.html | 3 ++- scripts/client.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6c788e8..34aebfc 100644 --- a/index.html +++ b/index.html @@ -56,6 +56,7 @@ function Acels (client) { } this.convert = (event) => { const accelerator = event.key === ' ' ? 'Space' : capitalize(event.key.replace('Arrow', '')) + console.log(event.key); if ((event.ctrlKey || event.metaKey) && event.shiftKey) { return `CmdOrCtrl+Shift+${accelerator}` } @@ -502,7 +503,7 @@ function Client () { this.acels.set('View', 'Toggle Guides', 'CmdOrCtrl+Shift+H', () => { this.surface.toggleGuides() }) this.acels.set('View', 'Toggle Commander', 'CmdOrCtrl+K', () => { this.commander.toggle() }) this.acels.set('View', 'Expand Commander', 'CmdOrCtrl+Shift+K', () => { this.commander.toggle(true) }) - this.acels.set('Project', 'Run', 'CmdOrCtrl+R', () => { this.commander.run() }) + this.acels.set('Project', 'Run', 'CmdOrCtrl+Enter', () => { this.commander.run() }) this.acels.set('Project', 'Re-Indent', 'CmdOrCtrl+Shift+I', () => { this.commander.lint() }) this.acels.set('Project', 'Clean', 'Escape', () => { this.commander.cleanup() }) this.acels.route(this) diff --git a/scripts/client.js b/scripts/client.js index 9b21953..407108e 100644 --- a/scripts/client.js +++ b/scripts/client.js @@ -50,7 +50,7 @@ function Client () { this.acels.set('View', 'Toggle Guides', 'CmdOrCtrl+Shift+H', () => { this.surface.toggleGuides() }) this.acels.set('View', 'Toggle Commander', 'CmdOrCtrl+K', () => { this.commander.toggle() }) this.acels.set('View', 'Expand Commander', 'CmdOrCtrl+Shift+K', () => { this.commander.toggle(true) }) - this.acels.set('Project', 'Run', 'CmdOrCtrl+R', () => { this.commander.run() }) + this.acels.set('Project', 'Run', 'CmdOrCtrl+Enter', () => { this.commander.run() }) this.acels.set('Project', 'Re-Indent', 'CmdOrCtrl+Shift+I', () => { this.commander.lint() }) this.acels.set('Project', 'Clean', 'Escape', () => { this.commander.cleanup() }) this.acels.route(this)