Changeset 37023

Timestamp:

03/16/2016 10:59:03 PM (9 years ago)

Author:

azaozz

Message:

TinyMCE: after discussion in Slack ​https://wordpress.slack.com/archives/core/p1458164584000700

• Remove *** and ___ text pattern and support for spaces in ---. The only <hr> text pattern is 3 or more dashes, no spaces.
• Remove the *, **, _, and __ text patterns for bold and italic.

Fixes #33300;

Location:

trunk/src/wp-includes/js/tinymce/plugins

Files:

• wordpress/plugin.js (modified) (1 diff)
• wptextpattern/plugin.js (modified) (1 diff)

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

@@ -292 +292 @@
                     tr({ '######': 'Heading 6' }) +
                     tr({ '---': 'Horizontal line' }) +
-                    tr({ '***': 'Horizontal line' }) +
-                '</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>';
         }

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

@@ -31 +31 @@
             { start: '######', format: 'h6' },
             { start: '>', format: 'blockquote' },
-            { regExp: /^\s*(?:(?:\* ?){3,}|(?:_ ?){3,}|(?:- ?){3,})\s*$/, element: 'hr' }
+            { regExp: /^(-){3,}$/, element: 'hr' }
         ];
 
         var inlinePatterns = [
-            { start: '*', end: '*', format: 'italic' },
-            { start: '**', end: '**', format: 'bold' },
-            { start: '_', end: '_', format: 'italic' },
-            { start: '__', end: '__', format: 'bold' },
             { start: '`', end: '`', format: 'code' }
         ];