fix: execute custom keyboard handlers when iframe has focus (#465)

closes #464
meetalva · Jun 12, 2018 · 9a6ebf5 · 9a6ebf5
1 parent ca834a7
commit 9a6ebf5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/electron/create-menu.ts b/src/electron/create-menu.ts
@@ -320,13 +320,7 @@ export function createMenu(ctx: MenuContext): void {
 				{
 					label: '&Delete',
 					enabled: typeof ctx.project !== 'undefined',
-					accelerator: (() => {
-						if (process.platform === 'darwin') {
-							return 'Backspace';
-						} else {
-							return 'Delete';
-						}
-					})(),
+					accelerator: process.platform === 'darwin' ? 'Backspace' : 'Delete',
 					click: () => {
 						Sender.send({
 							id: uuid.v4(),

diff --git a/src/electron/renderer.ts b/src/electron/renderer.ts
@@ -129,9 +129,8 @@ Sender.receive(message => {
 
 // tslint:disable-next-line:cyclomatic-complexity
 Sender.receive(message => {
-	// Do not perform custom operations
-	// if anything on the page has focus
-	if (document.activeElement !== document.body) {
+	// Do not perform custom operations when an input is selected
+	if (document.activeElement.tagName.toLowerCase() === 'input') {
 		return;
 	}