Change shortcut for remove block to primary shift x

WordPress · Aug 27, 2018 · 1e6f3f7 · 1e6f3f7
1 parent 9ca772d
commit 1e6f3f7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/edit-post/components/keyboard-shortcut-help-modal/config.js b/edit-post/components/keyboard-shortcut-help-modal/config.js
@@ -88,7 +88,7 @@ const blockShortcuts = {
 			description: __( 'Duplicate the selected block(s).' ),
 		},
 		{
-			keyCombination: ctrlShift( '-' ),
+			keyCombination: primaryShift( 'x' ),
 			description: __( 'Remove the selected block(s).' ),
 		},
 		{

diff --git a/edit-post/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap b/edit-post/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap
@@ -167,7 +167,7 @@ exports[`KeyboardShortcutHelpModal should match snapshot when the modal is activ
               "+",
               "Shift",
               "+",
-              "-",
+              "X",
             ],
           },
           Object {

diff --git a/packages/components/src/keyboard-shortcuts/index.js b/packages/components/src/keyboard-shortcuts/index.js
@@ -15,10 +15,6 @@ class KeyboardShortcuts extends Component {
 		super( ...arguments );
 
 		this.bindKeyTarget = this.bindKeyTarget.bind( this );
-
-		// Firefox uses keycode 173 for '-', while other browsers use 189.
-		// This line makes binding to the '-' key work consistently.
-		Mousetrap.addKeycodes( { 173: '-' } );
 	}
 
 	componentDidMount() {

diff --git a/packages/editor/src/components/block-settings-menu/index.js b/packages/editor/src/components/block-settings-menu/index.js
@@ -37,8 +37,8 @@ const shortcuts = {
 		display: displayShortcut.primaryShift( 'd' ),
 	},
 	removeBlock: {
-		raw: rawShortcut.ctrlShift( '-' ),
-		display: displayShortcut.ctrlShift( '-' ),
+		raw: rawShortcut.primaryShift( 'x' ),
+		display: displayShortcut.primaryShift( 'x' ),
 	},
 	insertBefore: {
 		raw: rawShortcut.primaryAlt( 't' ),
-Original file line number
+Diff line change
@@ Expand Up @@
                   "+",
                   "Shift",
                   "+",
-                  "-",
+                  "X",
                 ],
               },
               Object {
@@ Expand Down @@