aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/GlobalKeyHandler.ts
diff options
context:
space:
mode:
authorandrewdkim <adkim414@gmail.com>2019-07-26 17:37:12 -0400
committerandrewdkim <adkim414@gmail.com>2019-07-26 17:37:12 -0400
commit2dfd6378cf3f472132143bc231090777e49eeec7 (patch)
tree34e631e0551391e5786ae136ba1d596dbc876c76 /src/client/views/GlobalKeyHandler.ts
parent7cb850105aeefd1234f76aaab5badd45a8660dc4 (diff)
parente189378e5ce01eedd1373172fbd8d8dabf2ad197 (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into animationtimeline
Diffstat (limited to 'src/client/views/GlobalKeyHandler.ts')
-rw-r--r--src/client/views/GlobalKeyHandler.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index e8a588e58..7477c5b4f 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";
@@ -144,9 +144,11 @@ export default class KeyManager {
break;
case "y":
UndoManager.Redo();
+ stopPropagation = false;
break;
case "z":
UndoManager.Undo();
+ stopPropagation = false;
break;
case "a":
case "c":