From 0df6305f901e24ab1b3f4d3028f4c169059cb8e9 Mon Sep 17 00:00:00 2001
From: Menithal <menithal@norteclabs.com>
Date: Sat, 18 Feb 2017 18:22:01 +0200
Subject: [PATCH] Revert removal of hotkey from js event

---
 scripts/system/edit.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index d0236ce993..688fabab8b 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -849,7 +849,6 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Parent Entity to Last",
-        shortcutKey: "CTRL+P",
         afterItem: "Entity List...",
         grouping: "Advanced"
     });
@@ -858,7 +857,6 @@ function setupModelMenus() {
         menuName: "Edit",
         menuItemName: "Unparent Entity",
         afterItem: "Entity List...",
-        shortcutKey: "CTRL+SHIFT+P",
         grouping: "Advanced"
     });
     Menu.addMenuItem({
@@ -1374,6 +1372,12 @@ var keyReleaseEvent = function (event) {
             });
             grid.setPosition(newPosition);
         }
+    } else if (event.text === 'p' && event.isControl && !event.isAutoRepeat ) {
+        if (event.isShifted) {
+            unparentSelectedEntities();
+        } else {
+            parentSelectedEntities();
+        }
     }
 };
 Controller.keyReleaseEvent.connect(keyReleaseEvent);