WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: revert removing the numbers (2-6) after the headings in the drop-down. Seems it causes more confusion. 

See #27159.
Built from https://develop.svn.wordpress.org/trunk@38946


git-svn-id: http://core.svn.wordpress.org/trunk@38889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-10-26 06:16:30 +00:00
parent a91a41c10c
commit 11e7d3d250
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/class-wp-editor.php
View File

@ -839,7 +839,6 @@ final class _WP_Editors {
'Formats' => _x( 'Formats', 'TinyMCE' ), 'Formats' => _x( 'Formats', 'TinyMCE' ),
'Headings' => _x( 'Headings', 'TinyMCE' ), 'Headings' => _x( 'Headings', 'TinyMCE' ),
'Heading' => _x( 'Heading', 'TinyMCE' ),
'Heading 1' => array( __( 'Heading 1' ), 'access1' ), 'Heading 1' => array( __( 'Heading 1' ), 'access1' ),
'Heading 2' => array( __( 'Heading 2' ), 'access2' ), 'Heading 2' => array( __( 'Heading 2' ), 'access2' ),
'Heading 3' => array( __( 'Heading 3' ), 'access3' ), 'Heading 3' => array( __( 'Heading 3' ), 'access3' ),

6
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -578,12 +578,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
each( listbox.settings.values, function( item ) { each( listbox.settings.values, function( item ) {
if ( item.text && labels.hasOwnProperty( item.text ) ) { if ( item.text && labels.hasOwnProperty( item.text ) ) {
item.shortcut = '(' + labels[ item.text ] + ')'; item.shortcut = '(' + labels[ item.text ] + ')';
// Drop the numbers after the labels for headings.
// TinyMCE makes previews for the h1-h6. It uses the same styles that are applied in the editor body.
if ( item.text.indexOf( 'Heading' ) !== -1 ) {
item.text = 'Heading';
}
} }
} ); } );
} }

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38945'; $wp_version = '4.7-alpha-38946';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.