Changeset 44257 for trunk

Timestamp:

12/17/2018 01:48:05 AM (6 years ago)

Author:

SergeyBiryukov

Message:

TinyMCE: Fix the keyboard shortcut (Alt+Shift+H) to not open the default 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.

Props azaozz.
Merges [43915] to trunk.
Fixes #45365.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js (modified) (3 diffs)
• src/wp-includes/class-wp-editor.php (modified) (1 diff)

trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -371 +371 @@
 
         dialog = editor.windowManager.open( {
-            title: 'Keyboard Shortcuts',
+            title: editor.settings.classic_block_editor ? 'Classic Block Keyboard Shortcuts' : 'Keyboard Shortcuts',
             items: {
                 type: 'container',
@@ -653 +653 @@
             o: 'InsertOrderedList',
             m: 'WP_Medialib',
-            z: 'WP_Adv',
             t: 'WP_More',
             d: 'Strikethrough',
-            h: 'WP_Help',
             p: 'WP_Page',
             x: 'WP_Code'
@@ -668 +666 @@
             }
         } );
+
+        // 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 ) {

trunk/src/wp-includes/class-wp-editor.php

@@ -1288 +1288 @@
                 // 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,' ),