Changeset 40094

Timestamp:

02/21/2017 06:51:47 AM (8 years ago)

Author:

dd32

Message:

Customize: Trim whitespace from nav menu item titles so that the underlying object's original title appears as input placeholder and in the control's title.

Whitespace is trimmed from titles in PHP when saved in any case, so this aligns the client-side behavior with what happens on the server.

Amends [38618].
Merges [39994] to the 4.7 branch.
See #38015.
Fixes #39600.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/js/customize-nav-menus.js (modified) (2 diffs)

branches/4.7/src/wp-admin/js/customize-nav-menus.js

@@ -1510 +1510 @@
          */
         _setupTitleUI: function() {
-            var control = this;
-
+            var control = this, titleEl;
+
+            // Ensure that whitespace is trimmed on blur so placeholder can be shown.
+            control.container.find( '.edit-menu-item-title' ).on( 'blur', function() {
+                $( this ).val( $.trim( $( this ).val() ) );
+            } );
+
+            titleEl = control.container.find( '.menu-item-title' );
             control.setting.bind( function( item ) {
+                var trimmedTitle, titleText;
                 if ( ! item ) {
                     return;
                 }
-
-                var titleEl = control.container.find( '.menu-item-title' ),
-                    titleText = item.title || item.original_title || api.Menus.data.l10n.untitled;
+                trimmedTitle = $.trim( item.title );
+
+                titleText = trimmedTitle || item.original_title || api.Menus.data.l10n.untitled;
 
                 if ( item._invalid ) {
@@ -1525 +1532 @@
 
                 // Don't update to an empty title.
-                if ( item.title || item.original_title ) {
+                if ( trimmedTitle || item.original_title ) {
                     titleEl
                         .text( titleText )