diff options
| author | bob <bcz@cs.brown.edu> | 2019-07-30 09:41:08 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-07-30 09:41:08 -0400 |
| commit | fe2ae4e235a12198a530672d4db3fdcd167c6e65 (patch) | |
| tree | f44fbc2b53eba3eadc51b851600b706c0e451d5a /src/client/views/GlobalKeyHandler.ts | |
| parent | 5591060e868053c8839fcc1de1ae77d4dac361ac (diff) | |
| parent | e041988b84553797699a5a232e26e72252460e01 (diff) | |
Merge branch 'master' into youtube-api-muhammed
Diffstat (limited to 'src/client/views/GlobalKeyHandler.ts')
| -rw-r--r-- | src/client/views/GlobalKeyHandler.ts | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts index e8a588e58..e31b44514 100644 --- a/src/client/views/GlobalKeyHandler.ts +++ b/src/client/views/GlobalKeyHandler.ts @@ -1,4 +1,4 @@ -import { UndoManager, undoBatch } from "../util/UndoManager"; +import { UndoManager } from "../util/UndoManager"; import { SelectionManager } from "../util/SelectionManager"; import { CollectionDockingView } from "./collections/CollectionDockingView"; import { MainView } from "./MainView"; @@ -67,6 +67,7 @@ export default class KeyManager { } } MainView.Instance.toggleColorPicker(true); + SelectionManager.DeselectAll(); break; case "delete": case "backspace": @@ -132,6 +133,13 @@ export default class KeyManager { } MainView.Instance.mainFreeform && CollectionDockingView.Instance.CloseRightSplit(MainView.Instance.mainFreeform); break; + case "backspace": + if (document.activeElement) { + if (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA") { + return { stopPropagation: false, preventDefault: false }; + } + } + break; case "f": MainView.Instance.isSearchVisible = !MainView.Instance.isSearchVisible; break; @@ -144,14 +152,16 @@ export default class KeyManager { break; case "y": UndoManager.Redo(); + stopPropagation = false; break; case "z": UndoManager.Undo(); + stopPropagation = false; break; case "a": - case "c": case "v": case "x": + case "c": stopPropagation = false; preventDefault = false; break; |