Changeset 47294

Timestamp:

02/16/2020 06:25:54 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Menus: Restore the title of the currently active/expanded menu item when clicking "Cancel" after editing.

Other inputs are already restored to their previous values in that case.

Props Girishpanchal, nilamacharya, JoshuaWold, welcher, SergeyBiryukov.
Fixes #43031.

File:

• trunk/src/js/_enqueues/lib/nav-menu.js (modified) (4 diffs)

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

@@ -1163 +1163 @@
             var settings, item,
             matchedSection = /#(.*)$/.exec(clickedEl.href);
+
             if ( matchedSection && matchedSection[1] ) {
                 settings = $('#'+matchedSection[1]);
@@ -1187 +1188 @@
             var settings = $( clickedEl ).closest( '.menu-item-settings' ),
                 thisMenuItem = $( clickedEl ).closest( '.menu-item' );
-            thisMenuItem.removeClass('menu-item-edit-active').addClass('menu-item-edit-inactive');
-            settings.setItemData( settings.data('menu-item-data') ).hide();
+
+            thisMenuItem.removeClass( 'menu-item-edit-active' ).addClass( 'menu-item-edit-inactive' );
+            settings.setItemData( settings.data( 'menu-item-data' ) ).hide();
+            // Restore the title of the currently active/expanded menu item.
+            thisMenuItem.find( '.menu-item-title' ).text( settings.data( 'menu-item-data' )['menu-item-title'] );
+
             return false;
         },
@@ -1196 +1201 @@
             menuName = $('#menu-name'),
             menuNameVal = menuName.val();
+
             // Cancel and warn if invalid menu name.
             if ( ! menuNameVal || ! menuNameVal.replace( /\s+/, '' ) ) {
@@ -1224 +1230 @@
         eventOnClickMenuItemDelete : function(clickedEl) {
             var itemID = parseInt(clickedEl.id.replace('delete-', ''), 10);
+
             api.removeMenuItem( $('#menu-item-' + itemID) );
             api.registerChange();