WordPress.org

Make WordPress Core

Changeset 37023


Ignore:
Timestamp:
03/16/2016 10:59:03 PM (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

    r36807 r37023  
    292292                    tr({ '######': 'Heading 6' }) +
    293293                    tr({ '---': 'Horizontal line' }) +
    294                     tr({ '***': 'Horizontal line' }) +
    295                 '</table>';
    296 
    297             html = html +
    298                 '<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>' +
    299                 '<table class="wp-help-th-center fixed">' +
    300                     tr({ '*': 'Italic', '**': 'Bold' }) +
    301                     tr({ '_': 'Italic', '__': 'Bold' }) +
    302                     tr({ '`': 'Code', empty: '' }) +
    303294                '</table>';
    304295        }
  • trunk/src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js

    r36761 r37023  
    3131            { start: '######', format: 'h6' },
    3232            { start: '>', format: 'blockquote' },
    33             { regExp: /^\s*(?:(?:\* ?){3,}|(?:_ ?){3,}|(?:- ?){3,})\s*$/, element: 'hr' }
     33            { regExp: /^(-){3,}$/, element: 'hr' }
    3434        ];
    3535
    3636        var inlinePatterns = [
    37             { start: '*', end: '*', format: 'italic' },
    38             { start: '**', end: '**', format: 'bold' },
    39             { start: '_', end: '_', format: 'italic' },
    40             { start: '__', end: '__', format: 'bold' },
    4137            { start: '`', end: '`', format: 'code' }
    4238        ];
Note: See TracChangeset for help on using the changeset viewer.