Skip to content
Permalink
Browse files

TinyMCE: Fix the keyboard shortcut (Alt+Shift+H) to not open the defa…

…ult Block Editor help modal and change the title of the help modal to "Classic Block Keyboard Shortcuts" in the Classic BLock. Also remove Alt+Shift+Z in the Classic Block as it conflicts with the Block Editor.

Fixes #45365.

git-svn-id: https://develop.svn.wordpress.org/branches/5.0@43915 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
azaozz committed Nov 21, 2018
1 parent b9ac168 commit f02568afb4b36fae4a5d0457e60cb7f75ce05bec
Showing with 19 additions and 3 deletions.
  1. +1 −0 src/wp-includes/class-wp-editor.php
  2. +18 −3 src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -1268,6 +1268,7 @@ private static function get_translation() {
// Shortcuts help modal
'Keyboard Shortcuts' => array( __( 'Keyboard Shortcuts' ), 'accessH' ),
'Classic Block Keyboard Shortcuts' => __( 'Classic Block Keyboard Shortcuts' ),
'Default shortcuts,' => __( 'Default shortcuts,' ),
'Additional shortcuts,' => __( 'Additional shortcuts,' ),
'Focus shortcuts:' => __( 'Focus shortcuts:' ),
@@ -370,7 +370,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
html += '</div>';

dialog = editor.windowManager.open( {
title: 'Keyboard Shortcuts',
title: editor.settings.classic_block_editor ? 'Classic Block Keyboard Shortcuts' : 'Keyboard Shortcuts',
items: {
type: 'container',
classes: 'wp-help',
@@ -652,10 +652,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
u: 'InsertUnorderedList',
o: 'InsertOrderedList',
m: 'WP_Medialib',
z: 'WP_Adv',
t: 'WP_More',
d: 'Strikethrough',
h: 'WP_Help',
p: 'WP_Page',
x: 'WP_Code'
}, function( command, key ) {
@@ -668,6 +666,23 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
}
} );

// Alt+Shift+Z removes a block in the Block Editor, don't add it to the Classic Block.
if ( ! editor.settings.classic_block_editor ) {
editor.addShortcut( 'access+z', '', 'WP_Adv' );
}

// Workaround for not triggering the global help modal in the Block Editor by the Classic Block shortcut.
editor.on( 'keydown', function( event ) {
if ( event.shiftKey && event.altKey && event.code === 'KeyH' ) {
editor.execCommand( 'WP_Help' );
event.stopPropagation();
event.stopImmediatePropagation();
return false;
}

return true;
});

if ( window.getUserSetting( 'editor_plain_text_paste_warning' ) > 1 ) {
editor.settings.paste_plaintext_inform = false;
}

0 comments on commit f02568a

Please sign in to comment.
You can’t perform that action at this time.