From cd12dd8f6ddf2beda7e687597afbd9511ac116c7 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 14 Nov 2018 19:28:57 +0100
Subject: [PATCH] fix OSX shortcut inconsistencies

---
 scripts/system/edit.js                     | 18 +++++++++---------
 scripts/system/html/js/entityList.js       | 10 ++++++----
 scripts/system/html/js/entityProperties.js |  8 +++++---
 scripts/system/html/js/gridControls.js     |  8 +++++---
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 3876b1b074..48fdb8e565 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2722,23 +2722,23 @@ keyUpEventFromUIWindow = function(keyUpEvent) {
         focusKey(pressedValue);
     } else if (keyUpEvent.keyCodeString === "G") {
         gridKey(pressedValue);
-    } else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "X") {
+    } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "X") {
         selectionManager.cutSelectedEntities();
-    } else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "C") {
+    } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "C") {
         selectionManager.copySelectedEntities();
-    } else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "V") {
+    } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "V") {
         selectionManager.pasteEntities();
-    } else if (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "D") {
+    } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "D") {
         selectionManager.duplicateSelection();
-    } else if (keyUpEvent.ctrlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") {
+    } else if (keyUpEvent.controlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") {
         undoHistory.undo();
-    } else if (keyUpEvent.ctrlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") {
+    } else if (keyUpEvent.controlKey && !keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") {
         parentSelectedEntities();
-    } else if (keyUpEvent.ctrlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") {
+    } else if (keyUpEvent.controlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "P") {
         unparentSelectedEntities();
     } else if (
-        (keyUpEvent.ctrlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") ||
-        (keyUpEvent.ctrlKey && keyUpEvent.keyCodeString === "Y")) {
+        (keyUpEvent.controlKey && keyUpEvent.shiftKey && keyUpEvent.keyCodeString === "Z") ||
+        (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "Y")) {
 
         undoHistory.redo();
     } else if (WANT_DEBUG_MISSING_SHORTCUTS) {
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index ea096be5e2..141055f2b7 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -1123,7 +1123,9 @@ function loaded() {
                 return;
             }
 
-            let {code, key, keyCode, altKey, ctrlKey, shiftKey} = keyUpEvent;
+            let {code, key, keyCode, altKey, ctrlKey, metaKey, shiftKey} = keyUpEvent;
+
+            let controlKey = window.navigator.platform.startsWith("Mac") ? metaKey : ctrlKey;
 
             let keyCodeString;
             switch (keyCode) {
@@ -1138,7 +1140,7 @@ function loaded() {
                     break;
             }
 
-            if (ctrlKey && keyCodeString === "A") {
+            if (controlKey && keyCodeString === "A") {
                 let visibleEntityIDs = visibleEntities.map(visibleEntity => visibleEntity.id);
                 let selectionIncludesAllVisibleEntityIDs = visibleEntityIDs.every(visibleEntityID => {
                     return selectedEntities.includes(visibleEntityID);
@@ -1170,8 +1172,8 @@ function loaded() {
                     keyCode,
                     keyCodeString,
                     altKey,
-                    ctrlKey,
-                    shiftKey
+                    controlKey,
+                    shiftKey,
                 }
             }));
         }, false);
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 9bb8a2c5a4..847d583ca3 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -3502,7 +3502,9 @@ function loaded() {
             if (keyUpEvent.target.nodeName === "INPUT") {
                 return;
             }
-            let {code, key, keyCode, altKey, ctrlKey, shiftKey} = keyUpEvent;
+            let {code, key, keyCode, altKey, ctrlKey, metaKey, shiftKey} = keyUpEvent;
+
+            let controlKey = window.navigator.platform.startsWith("Mac") ? metaKey : ctrlKey;
 
             let keyCodeString;
             switch (keyCode) {
@@ -3525,8 +3527,8 @@ function loaded() {
                     keyCode,
                     keyCodeString,
                     altKey,
-                    ctrlKey,
-                    shiftKey
+                    controlKey,
+                    shiftKey,
                 }
             }));
         }, false);
diff --git a/scripts/system/html/js/gridControls.js b/scripts/system/html/js/gridControls.js
index 6f7024ccaa..70e91071fb 100644
--- a/scripts/system/html/js/gridControls.js
+++ b/scripts/system/html/js/gridControls.js
@@ -139,7 +139,9 @@ function loaded() {
         if (keyUpEvent.target.nodeName === "INPUT") {
             return;
         }
-        let {code, key, keyCode, altKey, ctrlKey, shiftKey} = keyUpEvent;
+        let {code, key, keyCode, altKey, ctrlKey, metaKey, shiftKey} = keyUpEvent;
+
+        let controlKey = window.navigator.platform.startsWith("Mac") ? metaKey : ctrlKey;
 
         let keyCodeString;
         switch (keyCode) {
@@ -162,8 +164,8 @@ function loaded() {
                 keyCode,
                 keyCodeString,
                 altKey,
-                ctrlKey,
-                shiftKey
+                controlKey,
+                shiftKey,
             }
         }));
     }, false);