Changeset 44680

Timestamp:

01/21/2019 10:09:48 PM (8 years ago)

Author:

pento

Message:

Menus: Remove error styling when the user addresses the error.

An error is triggered if a Menu Name isn't given when the user attempts to create a menu. When they go back and add a name, the error styling can be removed.

Props ashokrd2013, piyush9100, welcher, afercia.
Fixes #42321.

Location:

trunk/src

Files:

• js/_enqueues/lib/nav-menu.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/lib/nav-menu.js

@@ -836 +836 @@
                                 }
                         });
+
+                        $( '#menu-name' ).on( 'input', _.debounce( function () {
+                                var menuName = $( document.getElementById( 'menu-name' ) ),
+                                        menuNameVal = menuName.val();
+
+                                if ( ! menuNameVal || ! menuNameVal.replace( /\s+/, '' ) ) {
+                                        // Add warning for invalid menu name.
+                                        menuName.parent().addClass( 'form-invalid' );
+                                } else {
+                                        // Remove warning for valid menu name.
+                                        menuName.parent().removeClass( 'form-invalid' );
+                                }
+                        }, 500 ) );
+
                         $('#add-custom-links input[type="text"]').keypress(function(e){
                                 $('#customlinkdiv').removeClass('form-invalid');
@@ -1167 +1181 @@
                         menuNameVal = menuName.val();
                         // Cancel and warn if invalid menu name
-                        if( !menuNameVal || menuNameVal == menuName.attr('title') || !menuNameVal.replace(/\s+/, '') ) {
-                                menuName.parent().addClass('form-invalid');
+                        if ( ! menuNameVal || ! menuNameVal.replace( /\s+/, '' ) ) {
+                                menuName.parent().addClass( 'form-invalid' );
                                 return false;
                         }

trunk/src/wp-includes/script-loader.php

@@ -1780 +1780 @@
                 );
 
-                // Navigation Menus
-                $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
+                /*
+                 * Navigation Menus: Adding underscore as a dependency to utilize _.debounce
+                 * see https://core.trac.wordpress.org/ticket/42321
+                 */
+                $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2', 'underscore' ) );
                 did_action( 'init' ) && $scripts->localize(
                         'nav-menu',