From e0851c480775eae2195631be05df63ad59a44e9d Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 19 Oct 2018 09:51:53 -0700
Subject: [PATCH] Add cut to Create, and update shortcuts

---
 scripts/system/edit.js                       | 48 +++++++++++++-------
 scripts/system/libraries/entityCameraTool.js | 18 ++++----
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 24315857c4..e2c4d78d96 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1254,7 +1254,7 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Redo",
-        shortcutKey: 'Ctrl+Shift+Z',
+        shortcutKey: 'Ctrl+Y',
         position: 1,
     });
 
@@ -2468,6 +2468,11 @@ function createEntities(entityProperties) {
     return createdEntityIDs;
 }
 
+function cutSelectedEntities() {
+    copySelectedEntities();
+    deleteSelectedEntities();
+}
+
 function copySelectedEntities() {
     copyEntities(selectionManager.selections);
 }
@@ -2768,28 +2773,39 @@ var PopupMenu = function () {
     return this;
 };
 
+function whenPressed(fn) {
+    return function(value) {
+        if (value > 0) {
+            fn();
+        }
+    };
+}
+
+function whenReleased(fn) {
+    return function(value) {
+        if (value === 0) {
+            fn();
+        }
+    };
+}
+
 var mapping = Controller.newMapping(CONTROLLER_MAPPING_NAME);
 mapping.from([Controller.Hardware.Keyboard.Delete]).when([!Controller.Hardware.Application.PlatformMac]).to(deleteKey);
 mapping.from([Controller.Hardware.Keyboard.Backspace]).when([Controller.Hardware.Application.PlatformMac]).to(deleteKey);
-mapping.from([Controller.Hardware.Keyboard.D]).when([Controller.Hardware.Keyboard.Control]).to(deselectKey);
 mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey);
 mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey);
 mapping.from([Controller.Hardware.Keyboard.G]).to(gridKey);
-mapping.from([Controller.Hardware.Keyboard.C]).when([Controller.Hardware.Keyboard.Control]).to(copyKey);
-mapping.from([Controller.Hardware.Keyboard.V]).when([Controller.Hardware.Keyboard.Control]).to(pasteKey);
-
-function copyKey(value) {
-    if (value > 0) {
-        copySelectedEntities();
-    }
-}
-
-function pasteKey(value) {
-    if (value > 0) {
-        pasteEntities();
-    }
-}
+mapping.from([Controller.Hardware.Keyboard.X]).when([Controller.Hardware.Keyboard.Control]).to(whenReleased(cutSelectedEntities));
+mapping.from([Controller.Hardware.Keyboard.C]).when([Controller.Hardware.Keyboard.Control]).to(whenReleased(copySelectedEntities));
+mapping.from([Controller.Hardware.Keyboard.V]).when([Controller.Hardware.Keyboard.Control]).to(whenReleased(pasteEntities));
+mapping.from([Controller.Hardware.Keyboard.D])
+    .when([Controller.Hardware.Keyboard.Control])
+    .to(whenReleased(function() { SelectionManager.duplicateSelection() }));
 
+// Bind undo to ctrl-shift-z to maintain backwards-compatibility
+mapping.from([Controller.Hardware.Keyboard.Z])
+    .when([Controller.Hardware.Keyboard.Control, Controller.Hardware.Keyboard.Shift])
+    .to(whenPressed(function() { undoHistory.redo() }));
 
 
 var propertyMenu = new PopupMenu();
diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js
index 73e73d67a6..4410f19a5e 100644
--- a/scripts/system/libraries/entityCameraTool.js
+++ b/scripts/system/libraries/entityCameraTool.js
@@ -98,16 +98,18 @@ CameraManager = function() {
     }
 
     function getActionForKeyEvent(event) {
-        var action = keyToActionMapping[event.key];
-        if (action !== undefined) {
-            if (event.isShifted) {
-                if (action === "orbitForward") {
-                    action = "orbitUp";
-                } else if (action === "orbitBackward") {
-                    action = "orbitDown";
+        if (!event.isControl) {
+            var action = keyToActionMapping[event.key];
+            if (action !== undefined) {
+                if (event.isShifted) {
+                    if (action === "orbitForward") {
+                        action = "orbitUp";
+                    } else if (action === "orbitBackward") {
+                        action = "orbitDown";
+                    }
                 }
+                return action;
             }
-            return action;
         }
         return null;
     }