Remove ctrl+x action and fix comments

3DStreet · Aug 31, 2024 · 7868002 · 7868002
1 parent a1fc99c
commit 7868002
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/editor/components/modals/ModalHelp/components/Shortcuts/Shortcuts.component.jsx b/src/editor/components/modals/ModalHelp/components/Shortcuts/Shortcuts.component.jsx
@@ -12,7 +12,7 @@ const shortcuts = [
     { key: ['g'], description: 'Toggle grid visibility' },
     { key: ['n'], description: 'Add new entity' },
     { key: ['o'], description: 'Toggle local between global transform' },
-    { key: ['del | backspace'], description: 'Delete selected entity' }
+    { key: ['delete | backspace'], description: 'Delete selected entity' }
   ],
   [
     { key: ['0'], description: 'Toggle panels' },
@@ -24,11 +24,10 @@ const shortcuts = [
     { key: ['6'], description: 'Back view' },
     { key: ['7'], description: 'Front view' },
 
-    { key: ['ctrl | cmd', 'x'], description: 'Cut selected entity' },
-    { key: ['ctrl | cmd', 'c'], description: 'Copy selected entity' },
-    { key: ['ctrl | cmd', 'v'], description: 'Paste entity' },
+    { key: ['ctrl | cmd', 'c'], description: 'Copy selected entity' },
+    { key: ['ctrl | cmd', 'v'], description: 'Paste entity' },
     { key: ['h'], description: 'Show this help' },
-    { key: ['Esc'], description: 'Unselect entity' },
+    { key: ['esc'], description: 'Unselect entity' },
     { key: ['ctrl', 'alt', 'i'], description: 'Switch Edit and VR Modes' }
   ]
 ];

diff --git a/src/editor/lib/shortcuts.js b/src/editor/lib/shortcuts.js
@@ -33,7 +33,7 @@ export const Shortcuts = {
       Events.emit('openhelpmodal');
     }
 
-    // esc: close inspector
+    // esc: unselect entity
     if (keyCode === 27) {
       if (this.inspector.selectedEntity) {
         this.inspector.selectEntity(null);
@@ -65,7 +65,7 @@ export const Shortcuts = {
       Events.emit('togglegrid');
     }
 
-    // backspace & supr: remove selected entity
+    // backspace & delete: remove selected entity
     if (keyCode === 8 || keyCode === 46) {
       removeSelectedEntity();
     }
@@ -136,12 +136,6 @@ export const Shortcuts = {
         AFRAME.INSPECTOR.selectedEntity &&
         document.activeElement.tagName !== 'INPUT'
       ) {
-        // x: cut selected entity
-        if (event.keyCode === 88) {
-          AFRAME.INSPECTOR.entityToCopy = AFRAME.INSPECTOR.selectedEntity;
-          removeSelectedEntity(true);
-        }
-
         // c: copy selected entity
         if (event.keyCode === 67) {
           AFRAME.INSPECTOR.entityToCopy = AFRAME.INSPECTOR.selectedEntity;
@@ -154,7 +148,7 @@ export const Shortcuts = {
       }
     }
 
-    // º: toggle sidebars visibility
+    // 0: toggle sidebars visibility
     if (event.keyCode === 48) {
       Events.emit('togglesidebar', { which: 'all' });
       event.preventDefault();