Ticket #32728: 32728.diff

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

@@ -518 +518 @@
                         }
 
                         $this.attr( 'aria-label', title );
+                        $this.attr( 'title', title );
 
                         // Mark this item's accessibility as refreshed.
                         $this.data( 'needs_accessibility_refresh', false );

src/js/_enqueues/wp/customize/nav-menus.js

@@ -1664 +1664 @@
                         $reorderNav = control.container.find( '.menu-item-reorder-nav' );
                         $reorderNav.find( '.menus-move-up, .menus-move-down, .menus-move-left, .menus-move-right' ).on( 'click', function() {
                                 var moveBtn = $( this );
+                                control.params.depth = control.getDepth();
+                                
                                 moveBtn.focus();
 
                                 var isMoveUp = moveBtn.is( '.menus-move-up' ),
@@ -1677 +1679 @@
                                         control.moveDown();
                                 } else if ( isMoveLeft ) {
                                         control.moveLeft();
+                                        if ( 1 === control.params.depth ) {
+                                                control.container.find( '.is-submenu' ).hide();
+                                        } else {
+                                                control.container.find( '.is-submenu' ).show();
+                                        }
                                 } else if ( isMoveRight ) {
                                         control.moveRight();
+                                        control.params.depth += 1;
+                                        if ( 0 === control.params.depth ) {
+                                                control.container.find( '.is-submenu' ).hide();
+                                        } else {
+                                                control.container.find( '.is-submenu' ).show();
+                                        }
                                 }
 
                                 moveBtn.focus(); // Re-focus after the container was moved.

src/wp-admin/includes/class-walker-nav-menu-edit.php

@@ -179 +179 @@
                                                 }
 
                                                 printf(
-                                                        '<a class="item-edit" id="edit-%s" href="%s" aria-label="%s"><span class="screen-reader-text">%s</span></a>',
+                                                        '<a class="item-edit" id="edit-%s" href="%s" aria-label="%s" title="%s"><span class="screen-reader-text">%s</span></a>',
                                                         $item_id,
                                                         esc_url( $edit_url ),
                                                         esc_attr__( 'Edit menu item' ),
+                                                        esc_attr__( 'Edit menu item' ),
                                                         /* translators: Hidden accessibility text. */
                                                         __( 'Edit' )
                                                 );

src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php

@@ -69 +69 @@
                                 <span class="item-title" aria-hidden="true">
                                         <span class="spinner"></span>
                                         <span class="menu-item-title<# if ( ! data.title && ! data.original_title ) { #> no-title<# } #>">{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}</span>
+                                        <# if ( 0 === data.depth ) { #>
+                                                <span class="is-submenu" style="display: none;"><?php _e( 'sub item' ); ?></span>
+                                        <# } else { #>
+                                                <span class="is-submenu"><?php _e( 'sub item' ); ?></span>
+                                        <# } #>
                                 </span>
                                 <span class="item-controls">
-                                        <button type="button" class="button-link item-edit" aria-expanded="false"><span class="screen-reader-text">
+                                        <button type="button" class="button-link item-edit" aria-expanded="false">
                                         <?php
                                                 /* translators: 1: Title of a menu item, 2: Type of a menu item. */
-                                                printf( __( 'Edit menu item: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' );
+                                                printf( __( '<a class="item-edit" id="edit-%s" href="%s" aria-label="%s" title="%s"><span class="screen-reader-text">%s</span></a>' ), '{{ data.menu_item_id }}', '{{ data.url }}', esc_attr__( 'Edit menu item' ), '{{data.title}}', __( 'Edit' ) );
                                         ?>
-                                        </span><span class="toggle-indicator" aria-hidden="true"></span></button>
+                                        <span class="toggle-indicator" aria-hidden="true"></span></button>
                                         <button type="button" class="button-link item-delete submitdelete deletion"><span class="screen-reader-text">
                                         <?php
                                                 /* translators: 1: Title of a menu item, 2: Type of a menu item. */