Changeset 36761

Timestamp:

02/28/2016 06:59:25 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE textpattern:

• Add description of the new patterns to the Shortcuts help modal.
• Fix the layout a bit and make the patterns in two columns.
• Disable the textpatterns plugin in IE < 9.

See #33300.

Location:

trunk/src/wp-includes

Files:

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

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

@@ -1067 +1067 @@
                         'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
                                 __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
+                        'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' =>
+                                __( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ),
                 );
 

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

@@ -137 +137 @@
 }
 
+.mce-window .wp-editor-help table.wp-help-single {
+        margin: 0 8px 20px;
+}
+
+.mce-window .wp-editor-help table.fixed {
+        table-layout: fixed;
+}
+
+.mce-window .wp-editor-help table.fixed th:nth-child(odd),
+.mce-window .wp-editor-help table.fixed td:nth-child(odd) {
+        width: 12%;
+}
+
+.mce-window .wp-editor-help table.fixed th:nth-child(even),
+.mce-window .wp-editor-help table.fixed td:nth-child(even) {
+        width: 38%;
+}
+
+.mce-window .wp-editor-help table.fixed th:nth-child(odd) {
+        padding: 5px 0 0;
+}
+
 .mce-window .wp-editor-help td,
 .mce-window .wp-editor-help th {
@@ -158 +180 @@
         background: #eaeaea;
         background: rgba(0,0,0,0.08);
-}
-
-.mce-window .wp-help-header td {
-        font-weight: bold;
-        padding: 0 5px;
 }
 

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

@@ -263 +263 @@
                 html = html +
                         '<h2>' + __( 'Default shortcuts,' ) + ' ' + meta + '</h2>' +
-                        '<table class="wp-help-th-center">' +
+                        '<table class="wp-help-th-center fixed">' +
                                 header +
                                 table1.join('') +
                         '</table>' +
                         '<h2>' + __( 'Additional shortcuts,' ) + ' ' + access + '</h2>' +
-                        '<table class="wp-help-th-center">' +
+                        '<table class="wp-help-th-center fixed">' +
                                 header +
                                 table2.join('') +
                         '</table>';
 
-                if ( editor.plugins.wptextpattern ) {
+                if ( editor.plugins.wptextpattern && ( ! tinymce.Env.ie || tinymce.Env.ie > 8 ) ) {
                         // Text pattern section
                         html = html +
                                 '<h2>' + __( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' +
-                                '<table>' +
-                                        tr({ '*':  'Bullet list' }) +
-                                        tr({ '-':  'Bullet list' }) +
-                                        tr({ '1.':  'Numbered list' }) +
-                                        tr({ '1)':  'Numbered list' }) +
+                                '<table class="wp-help-th-center fixed">' +
+                                        tr({ '*':  'Bullet list', '1.':  'Numbered list' }) +
+                                        tr({ '-':  'Bullet list', '1)':  'Numbered list' }) +
                                 '</table>';
 
                         html = html +
                                 '<h2>' + __( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ) + '</h2>' +
-                                '<table>' +
+                                '<table class="wp-help-single">' +
                                         tr({ '>': 'Blockquote' }) +
                                         tr({ '##': 'Heading 2' }) +
@@ -293 +291 @@
                                         tr({ '#####': 'Heading 5' }) +
                                         tr({ '######': 'Heading 6' }) +
+                                        tr({ '---': 'Horizontal rule' }) +
+                                        tr({ '***': 'Horizontal rule' }) +
+                                '</table>';
+
+                        html = html +
+                                '<h2>' + __( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ) + '</h2>' +
+                                '<table class="wp-help-th-center fixed">' +
+                                        tr({ '*': 'Italic', '**': 'Bold' }) +
+                                        tr({ '_': 'Italic', '__': 'Bold' }) +
+                                        tr({ '`': 'Code', empty: '' }) +
                                 '</table>';
                 }
@@ -299 +307 @@
                 html = html +
                         '<h2>' + __( 'Focus shortcuts:' ) + '</h2>' +
-                        '<table>' +
+                        '<table class="wp-help-single">' +
                                 tr({ 'Alt + F8':  'Inline toolbar (when an image, link or preview is selected)' }) +
                                 tr({ 'Alt + F9':  'Editor menu (when enabled)' }) +

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

@@ -12 +12 @@
  */
 ( function( tinymce, setTimeout ) {
+        if ( tinymce.Env.ie && tinymce.Env.ie < 9 ) {
+                return;
+        }
+
         tinymce.PluginManager.add( 'wptextpattern', function( editor ) {
                 var VK = tinymce.util.VK;
@@ -83 +87 @@
                         var zero;
 
-                        if ( node.nodeType !== 3 || ! node.data.length || ! offset ) {
+                        if ( ! node || node.nodeType !== 3 || ! node.data.length || ! offset ) {
                                 return;
                         }