Changeset 38946

Timestamp:

10/26/2016 06:15:54 AM (9 years ago)

Author:

azaozz

Message:

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

See #27159.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -840 +840 @@
 
             'Headings' => _x( 'Headings', 'TinyMCE' ),
-            'Heading' => _x( 'Heading', 'TinyMCE' ),
             'Heading 1' => array( __( 'Heading 1' ), 'access1' ),
             'Heading 2' => array( __( 'Heading 2' ), 'access2' ),

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

@@ -579 +579 @@
                         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';
-                            }
                         }
                     } );