Changeset 58306
- Timestamp:
- 06/03/2024 08:33:03 PM (2 months ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/js/_enqueues/lib/nav-menu.js
r54855 r58306 450 450 451 451 var thisLink, thisLinkText, primaryItems, itemPosition, title, 452 parentItem, parentItemId, parentItemName, subItems, 452 parentItem, parentItemId, parentItemName, subItems, 453 453 $this = $( itemToRefresh ), 454 454 menuItem = $this.closest( 'li.menu-item' ).first(), … … 456 456 isPrimaryMenuItem = ( 0 === depth ), 457 457 itemName = $this.closest( '.menu-item-handle' ).find( '.menu-item-title' ).text(), 458 458 459 position = parseInt( menuItem.index(), 10 ), 459 460 prevItemDepth = ( isPrimaryMenuItem ) ? depth : parseInt( depth - 1, 10 ), … … 504 505 itemPosition = primaryItems.index( menuItem ) + 1, 505 506 totalMenuItems = primaryItems.length, 506 507 507 // String together help text for primary menu items. 508 title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$ d', itemPosition ).replace( '%3$d', totalMenuItems );508 title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$$d', totalMenuItems ); 509 509 } else { 510 510 parentItem = menuItem.prevAll( '.menu-item-depth-' + parseInt( depth - 1, 10 ) ).first(), … … 512 512 parentItemName = parentItem.find( '.menu-item-title' ).text(), 513 513 subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemId + '"]' ), 514 514 515 itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 1; 515 516 516 517 // String together help text for sub menu items. 517 title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName ); 518 if ( depth < 2 ) { 519 title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$s', menuItemType ).replace( '%3$d', itemPosition ).replace( '%4$d', totalSubItems ).replace( '%5$s', parentItemName ); 520 } else { 521 title = menus.subMenuMoreDepthFocus.replace( '%1$s', itemName ).replace( '%2$s', menuItemType ).replace( '%3$d', itemPosition ).replace( '%4$d', totalSubItems ).replace( '%5$s', parentItemName ).replace( '%6$d', depth ); 522 } 518 523 } 519 524 … … 733 738 api.refreshKeyboardAccessibility(); 734 739 api.refreshAdvancedAccessibility(); 740 735 741 }, 736 742 change: function(e, ui) { -
trunk/src/js/_enqueues/wp/customize/nav-menus.js
r57746 r58306 3 3 */ 4 4 5 /* global _wpCustomizeNavMenusSettings, wpNavMenu, console */5 /* global _wpCustomizeNavMenusSettings, wpNavMenu, console */ 6 6 ( function( api, wp, $ ) { 7 7 'use strict'; … … 1133 1133 wpNavMenu.menuList.attr( 'id', 'menu-to-edit' ).addClass( 'menu' ); 1134 1134 1135 1136 1135 1137 _.each( api.section( section.id ).controls(), function( control ) { 1136 1138 if ( 'nav_menu_item' === control.params.type ) { … … 1576 1578 1577 1579 /** 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1578 1654 * Override the embed() method to do nothing, 1579 1655 * so that the control isn't embedded on load, … … 1608 1684 control.renderContent(); 1609 1685 control.deferred.embedded.resolve(); // This triggers control.ready(). 1686 1687 1688 1610 1689 }, 1611 1690 … … 1680 1759 } else if ( isMoveLeft ) { 1681 1760 control.moveLeft(); 1682 if ( 1 === control.params.depth ) {1683 control.container.find( '.is-submenu' ).hide();1684 } else {1685 control.container.find( '.is-submenu' ).show();1686 }1687 1761 } else if ( isMoveRight ) { 1688 1762 control.moveRight(); 1689 1763 control.params.depth += 1; 1690 if ( 0 === control.params.depth ) { 1691 control.container.find( '.is-submenu' ).hide(); 1692 } else { 1693 control.container.find( '.is-submenu' ).show(); 1694 } 1695 } 1696 1764 } 1765 1697 1766 moveBtn.focus(); // Re-focus after the container was moved. 1767 1768 1769 1698 1770 } ); 1699 1771 }, … … 2727 2799 menuItemControl.setting.set( setting ); 2728 2800 }); 2801 2802 2803 2729 2804 }); 2730 2805 -
trunk/src/wp-admin/nav-menus.php
r56600 r58306 581 581 /* translators: %s: Previous item name. */ 582 582 'outFrom' => __( 'Out from under %s' ), 583 /* translators: 1: Item name, 2: Item position, 3: Total number of items. */ 584 'menuFocus' => __( '%1$s. Menu item %2$d of %3$d.' ), 585 /* translators: 1: Item name, 2: Item position, 3: Parent item name. */ 586 'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ), 583 /* translators: 1: Item name, 2: Item type, 3: Item index, 4: Total items. */ 584 'menuFocus' => __( 'Edit %1$s (%2$s, %3$d of %4$d)' ), 585 /* translators: 1: Item name, 2: Item type, 3: Item index, 4: Total items, 5: Item parent. */ 586 'subMenuFocus' => __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s)' ), 587 /* translators: 1: Item name, 2: Item type, 3: Item index, 4: Total items, 5: Item parent, 6: Item depth. */ 588 'subMenuMoreDepthFocus' => __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s, level %6$d)' ), 587 589 /* translators: %s: Item name. */ 588 590 'menuItemDeletion' => __( 'item %s' ), -
trunk/src/wp-includes/class-wp-customize-nav-menus.php
r58146 r58306 563 563 /* translators: %s: Previous item name. */ 564 564 'outFrom' => __( 'Out from under %s' ), 565 /* translators: 1: Item name, 2: Item position, 3: Total number of items. */ 566 'menuFocus' => __( '%1$s. Menu item %2$d of %3$d.' ), 567 /* translators: 1: Item name, 2: Item position, 3: Parent item name. */ 568 'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ), 565 /* translators: 1: Item name, 2: Item type, 3: Item index, 4: Total items. */ 566 'menuFocus' => __( 'Edit %1$s (%2$s, %3$d of %4$d)' ), 567 /* translators: 1: Item name, 2: Item type, 3: Item index, 4: Total items, 5: Item parent. */ 568 'subMenuFocus' => __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s)' ), 569 /* translators: 1: Item name, 2: Item type, 3: Item index, 4: Total items, 5: Item parent, 6: Item depth. */ 570 'subMenuMoreDepthFocus' => __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s, level %6$d)' ), 569 571 ); 570 572 wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n ); -
trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
r57746 r58306 78 78 <span class="item-controls"> 79 79 <button type="button" class="button-link item-edit" aria-expanded="false"><span class="screen-reader-text"> 80 <?php 81 /* translators: 1: Title of a menu item, 2: Type of a menu item. */ 82 printf( __( 'Edit menu item: %1$s (%2$s)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' ); 83 ?> 80 <# if ( 0 === data.depth ) { #> 81 <?php 82 /* translators: 1: Title of a menu item, 2: Type of a menu item. 3: Item index, 4: Total items. */ 83 printf( __( 'Edit %1$s (%2$s, %3$d of %4$d)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}', '', '' ); 84 ?> 85 <# } else if ( 1 === data.depth ) { #> 86 <?php 87 /* translators: 1: Title of a menu item, 2: Type of a menu item, 3, Item index, 4, Total items, 5: Item parent. */ 88 printf( __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}', '', '', '' ); 89 ?> 90 <# } else { #> 91 <?php 92 /* translators: 1: Title of a menu item, 2: Type of a menu item, 3, Item index, 4, Total items, 5: Item parent, 6: Item depth. */ 93 printf( __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s, level %6$s)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}', '', '', '', '{{data.depth}}' ); 94 ?> 95 <# } #> 84 96 </span><span class="toggle-indicator" aria-hidden="true"></span></button> 85 97 <button type="button" class="button-link item-delete submitdelete deletion"><span class="screen-reader-text">
Note: See TracChangeset
for help on using the changeset viewer.