Changeset 33127

Timestamp:

07/08/2015 07:42:59 PM (8 years ago)

Author:

azaozz

Message:

TinyMCE: add help for the text patterns to the shortcuts help popup.
See #31441.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• css/editor.css (modified) (1 diff)
• js/tinymce/plugins/wordpress/plugin.js (modified) (3 diffs)

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

@@ -1046 +1046 @@
             'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
                 __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
+            'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
+                __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
         );
 

trunk/src/wp-includes/css/editor.css

@@ -151 +151 @@
     font-weight: bold;
     padding: 5px 0 0;
+}
+
+.mce-window .wp-editor-help .wp-help-th-center th {
     text-align: center;
 }

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -206 +206 @@
             table1 = [],
             table2 = [],
-            header;
+            header, html;
 
         each( [
@@ -251 +251 @@
         header = '<tr class="wp-help-header"><td>' + header.join( '</td><td>' ) + '</td></tr>';
 
+        html = '<div class="wp-editor-help">';
+
+        // Main section, default and additional shortcuts
+        html = html +
+            '<p>' + __( 'Default shortcuts,' ) + ' ' + meta + '</p>' +
+            '<table class="wp-help-th-center">' +
+                header +
+                table1.join('') +
+            '</table>' +
+            '<p>' + __( 'Additional shortcuts,' ) + ' ' + access + '</p>' +
+            '<table class="wp-help-th-center">' +
+                header +
+                table2.join('') +
+            '</table>';
+
+        if ( editor.plugins.wptextpattern ) {
+            // Text pattern section
+            html = html +
+                '<p>' + __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</p>' +
+                '<table>' +
+                    tr({ '* or -':  'Bullet list' }) +
+                    tr({ '1. or 1)':  'Numbered list' }) +
+                    tr({ '>': 'Blockquote' }) +
+                    tr({ '##': 'Heading 2' }) +
+                    tr({ '###': 'Heading 3' }) +
+                    tr({ '####': 'Heading 4' }) +
+                    tr({ '#####': 'Heading 5' }) +
+                    tr({ '######': 'Heading 6' }) +
+                '</table>';
+        }
+
+        // Focus management section
+        html = html +
+            '<p>' + __( 'Focus shortcuts:' ) + '</p>' +
+            '<table>' +
+                tr({ 'Alt + F8':  'Inline toolbar (when an image, link or preview is selected)' }) +
+                tr({ 'Alt + F9':  'Editor menu (when enabled)' }) +
+                tr({ 'Alt + F10': 'Editor toolbar' }) +
+                tr({ 'Alt + F11': 'Elements path' }) +
+            '</table>' +
+            '<p>' + __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ) + '</p>';
+
+        html += '</div>';
+
         editor.windowManager.open( {
             title: 'Keyboard Shortcuts',
@@ -256 +300 @@
                 type: 'container',
                 classes: 'wp-help',
-                html: (
-                    '<div class="wp-editor-help">' +
-                    '<p>' + __( 'Default shortcuts,' ) + ' ' + meta + '</p>' +
-                    '<table>' +
-                        header +
-                        table1.join('') +
-                    '</table>' +
-                    '<p>' + __( 'Additional shortcuts,' ) + ' ' + access + '</p>' +
-                    '<table>' +
-                        header +
-                        table2.join('') +
-                    '</table>' +
-                    '<p>' + __( 'Focus shortcuts:' ) + '</p>' +
-                    '<table>' +
-                        tr({ 'Alt + F8':  'Inline toolbar (when an image, link or preview is selected)' }) +
-                        tr({ 'Alt + F9':  'Editor menu (when enabled)' }) +
-                        tr({ 'Alt + F10': 'Editor toolbar' }) +
-                        tr({ 'Alt + F11': 'Elements path' }) +
-                    '</table>' +
-                    '<p>' + __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ) + '</p>' +
-                    '</div>'
-                )
+                html: html
             },
             buttons: {