- 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;

git-svn-id: https://develop.svn.wordpress.org/trunk@37023 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2016-03-16 22:59:03 +00:00
parent f1af2813d3
commit 3014f291ae
2 changed files with 1 additions and 14 deletions

View File

@ -291,15 +291,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
tr({ '#####': 'Heading 5' }) +
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>';
}

View File

@ -30,14 +30,10 @@
{ start: '#####', format: 'h5' },
{ 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' }
];