Changeset 60821 for branches/6.5/src/js/_enqueues/lib/nav-menu.js

Timestamp:

09/30/2025 05:00:43 PM (2 months ago)

Author:

desrosj

Message:

Grouped backports for the 6.5 branch.

• REST API: Increase the specificity of capability checks for collections when the edit context is in use.
• Menus: Prevent HTML in menu item titles from being rendered unexpectedly.

Merges [60814], [60815], [60816] to the 6.5 branch.

Props andraganescu, desrosj, ehti, hurayraiit, iandunn, joehoyle, johnbillion, jorbin, mnelson4, noisysocks, peterwilsoncc, phillsav, rmccue, timothyblynjacobs, vortfu, westonruter , whyisjake, zieladam.

Location:

branches/6.5

Files:

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

branches/6.5/src/js/_enqueues/lib/nav-menu.js

@@ -1010 +1010 @@
 
                 if ( this.checked === true ) {
-                    $( '#pending-menu-items-to-delete ul' ).append(
-                        '<li data-menu-item-id="' + menuItemID + '">' +
-                            '<span class="pending-menu-item-name">' + menuItemName + '</span> ' +
-                            '<span class="pending-menu-item-type">(' + menuItemType + ')</span>' +
-                            '<span class="separator"></span>' +
-                        '</li>'
-                    );
+                    const $li = $( '<li>', { 'data-menu-item-id': menuItemID } );
+                    $li.append( $( '<span>', {
+                        'class': 'pending-menu-item-name',
+                        text: menuItemName
+                    } ) );
+                    $li.append( ' ' );
+                    $li.append( $( '<span>', {
+                        'class': 'pending-menu-item-type',
+                        text: '(' + menuItemType + ')',
+                    } ) );
+                    $li.append( $( '<span>', { 'class': 'separator' } ) );
+                    $( '#pending-menu-items-to-delete ul' ).append( $li );
                 }
 
@@ -1405 +1410 @@
 
         eventOnClickMenuSave : function() {
-            var locs = '',
-            menuName = $('#menu-name'),
-            menuNameVal = menuName.val();
+            var menuName = $('#menu-name'),
+                menuNameVal = menuName.val();
 
             // Cancel and warn if invalid menu name.
@@ -1415 +1419 @@
             }
             // Copy menu theme locations.
+            // Note: This appears to be dead code since #nav-menu-theme-locations no longer exists, perhaps removed in r32842.
+            var $updateNavMenu = $('#update-nav-menu');
             $('#nav-menu-theme-locations select').each(function() {
-                locs += '<input type="hidden" name="' + this.name + '" value="' + $(this).val() + '" />';
-            });
-            $('#update-nav-menu').append( locs );
+                $updateNavMenu.append(
+                    $( '<input>', {
+                        type: 'hidden',
+                        name: this.name,
+                        value: $( this ).val(),
+                    } )
+                );
+            });
             // Update menu item position data.
             api.menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );
@@ -1461 +1472 @@
 
             if( ! $items.length ) {
-                $('.categorychecklist', panel).html( '<li><p>' + wp.i18n.__( 'No results found.' ) + '</p></li>' );
+                const li = $( '<li>' );
+                const p = $( '<p>', { text: wp.i18n.__( 'No results found.' ) } );
+                li.append( p );
+                $('.categorychecklist', panel).empty().append( li );
                 $( '.spinner', panel ).removeClass( 'is-active' );
                 wrapper.addClass( 'has-no-menu-item' );