From 9b8697aea3d780cfd6a9c8d11e81db84fae1233c Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 26 Oct 2016 06:15:54 +0000 Subject: [PATCH] TinyMCE: revert removing the numbers (2-6) after the headings in the drop-down. Seems it causes more confusion. See #27159. git-svn-id: https://develop.svn.wordpress.org/trunk@38946 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-editor.php | 1 - src/wp-includes/js/tinymce/plugins/wordpress/plugin.js | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index 9c6738907c..b20126f53e 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -839,7 +839,6 @@ final class _WP_Editors { 'Formats' => _x( 'Formats', 'TinyMCE' ), 'Headings' => _x( 'Headings', 'TinyMCE' ), - 'Heading' => _x( 'Heading', 'TinyMCE' ), 'Heading 1' => array( __( 'Heading 1' ), 'access1' ), 'Heading 2' => array( __( 'Heading 2' ), 'access2' ), 'Heading 3' => array( __( 'Heading 3' ), 'access3' ), diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 6565221c28..beaddf945f 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -578,12 +578,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { each( listbox.settings.values, function( item ) { if ( item.text && labels.hasOwnProperty( 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'; - } } } ); }