From d86ec21b6ae1a59e8f75523dbf513fb1f7172e14 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Wed, 6 Mar 2024 19:46:37 +0530 Subject: [PATCH 01/45] Select Field Addition --- .../class-walker-nav-menu-checklist.php | 2 +- .../includes/class-walker-nav-menu-edit.php | 14 +++++++++++++- src/wp-includes/class-walker-comment.php | 2 +- src/wp-includes/class-walker-nav-menu.php | 2 +- src/wp-includes/class-wp-walker.php | 18 +++++++++--------- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/wp-admin/includes/class-walker-nav-menu-checklist.php b/src/wp-admin/includes/class-walker-nav-menu-checklist.php index 6fc5c4169048d..e6706c875cf6d 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-checklist.php +++ b/src/wp-admin/includes/class-walker-nav-menu-checklist.php @@ -73,7 +73,7 @@ public function end_lvl( &$output, $depth = 0, $args = null ) { * @param stdClass $args Not used. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = null ) { global $_nav_menu_placeholder, $nav_menu_selected_id; // Restores the more descriptive, specific name for use within this method. diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index 7cc7052cdba16..b5a25f316242f 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -57,10 +57,11 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {} * @param stdClass $args Not used. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = null ) { global $_wp_nav_menu_max_depth; // Restores the more descriptive, specific name for use within this method. + $menu_items = $all_elements; $menu_item = $data_object; $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; @@ -261,6 +262,17 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur + menu_item_parent; ?> +
+ + +
type && false !== $original_title ) : ?> diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php index 825a28334b14f..588986cdebbad 100644 --- a/src/wp-includes/class-walker-comment.php +++ b/src/wp-includes/class-walker-comment.php @@ -128,7 +128,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) { * @param array $args An array of arguments. * @param string $output Used to append additional content. Passed by reference. */ - public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) { + public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $all_elements = null ) { if ( ! $element ) { return; } diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php index 4683970c61d85..ec2719e898e3f 100644 --- a/src/wp-includes/class-walker-nav-menu.php +++ b/src/wp-includes/class-walker-nav-menu.php @@ -135,7 +135,7 @@ public function end_lvl( &$output, $depth = 0, $args = null ) { * @param stdClass $args An object of wp_nav_menu() arguments. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = null ) { // Restores the more descriptive, specific name for use within this method. $menu_item = $data_object; diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php index e44907ee70884..adeab9e1cf154 100644 --- a/src/wp-includes/class-wp-walker.php +++ b/src/wp-includes/class-wp-walker.php @@ -130,7 +130,7 @@ public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {} * @param array $args An array of arguments. * @param string $output Used to append additional content (passed by reference). */ - public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) { + public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $all_elements = null ) { if ( ! $element ) { return; } @@ -144,7 +144,7 @@ public function display_element( $element, &$children_elements, $max_depth, $dep $args[0]['has_children'] = $this->has_children; // Back-compat. } - $this->start_el( $output, $element, $depth, ...array_values( $args ) ); + $this->start_el( $output, $element, $depth, array_values( $args ), '', $all_elements ); // Descend only when the depth is right and there are children for this element. if ( ( 0 == $max_depth || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) { @@ -156,7 +156,7 @@ public function display_element( $element, &$children_elements, $max_depth, $dep // Start the child delimiter. $this->start_lvl( $output, $depth, ...array_values( $args ) ); } - $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output ); + $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output, $all_elements ); } unset( $children_elements[ $id ] ); } @@ -202,7 +202,7 @@ public function walk( $elements, $max_depth, ...$args ) { if ( -1 == $max_depth ) { $empty_array = array(); foreach ( $elements as $e ) { - $this->display_element( $e, $empty_array, 1, 0, $args, $output ); + $this->display_element($e, $empty_array, 1, 0, $args, $output, $elements ); } return $output; } @@ -244,7 +244,7 @@ public function walk( $elements, $max_depth, ...$args ) { } foreach ( $top_level_elements as $e ) { - $this->display_element( $e, $children_elements, $max_depth, 0, $args, $output ); + $this->display_element( $e, $children_elements, $max_depth, 0, $args, $output, $elements ); } /* @@ -255,7 +255,7 @@ public function walk( $elements, $max_depth, ...$args ) { $empty_array = array(); foreach ( $children_elements as $orphans ) { foreach ( $orphans as $op ) { - $this->display_element( $op, $empty_array, 1, 0, $args, $output ); + $this->display_element( $op, $empty_array, 1, 0, $args, $output, $elements ); } } } @@ -332,7 +332,7 @@ public function paged_walk( $elements, $max_depth, $page_num, $per_page, ...$arg if ( $count >= $end ) { break; } - $this->display_element( $e, $empty_array, 1, 0, $args, $output ); + $this->display_element( $e, $empty_array, 1, 0, $args, $output, $elements ); } return $output; } @@ -387,14 +387,14 @@ public function paged_walk( $elements, $max_depth, $page_num, $per_page, ...$arg break; } - $this->display_element( $e, $children_elements, $max_depth, 0, $args, $output ); + $this->display_element( $e, $children_elements, $max_depth, 0, $args, $output, $elements ); } if ( $end >= $total_top && count( $children_elements ) > 0 ) { $empty_array = array(); foreach ( $children_elements as $orphans ) { foreach ( $orphans as $op ) { - $this->display_element( $op, $empty_array, 1, 0, $args, $output ); + $this->display_element( $op, $empty_array, 1, 0, $args, $output, $elements ); } } } From 9328675548789f6df0ff33eff5acada6cd0cc854 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Wed, 6 Mar 2024 21:17:40 +0530 Subject: [PATCH 02/45] Added $all_elements to all walker --- src/wp-admin/includes/class-walker-category-checklist.php | 2 +- src/wp-admin/includes/class-walker-nav-menu-checklist.php | 2 +- src/wp-includes/class-walker-category-dropdown.php | 2 +- src/wp-includes/class-walker-category.php | 2 +- src/wp-includes/class-walker-comment.php | 4 ++-- src/wp-includes/class-walker-nav-menu.php | 2 +- src/wp-includes/class-walker-page-dropdown.php | 2 +- src/wp-includes/class-walker-page.php | 2 +- src/wp-includes/class-wp-walker.php | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/wp-admin/includes/class-walker-category-checklist.php b/src/wp-admin/includes/class-walker-category-checklist.php index 1deb3f9206932..ab70c511aea33 100644 --- a/src/wp-admin/includes/class-walker-category-checklist.php +++ b/src/wp-admin/includes/class-walker-category-checklist.php @@ -70,7 +70,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) { * @param array $args An array of arguments. See {@see wp_terms_checklist()}. * @param int $current_object_id Optional. ID of the current term. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $category = $data_object; diff --git a/src/wp-admin/includes/class-walker-nav-menu-checklist.php b/src/wp-admin/includes/class-walker-nav-menu-checklist.php index e6706c875cf6d..c01ddbb60684c 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-checklist.php +++ b/src/wp-admin/includes/class-walker-nav-menu-checklist.php @@ -73,7 +73,7 @@ public function end_lvl( &$output, $depth = 0, $args = null ) { * @param stdClass $args Not used. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = null ) { + public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = array() ) { global $_nav_menu_placeholder, $nav_menu_selected_id; // Restores the more descriptive, specific name for use within this method. diff --git a/src/wp-includes/class-walker-category-dropdown.php b/src/wp-includes/class-walker-category-dropdown.php index 93078389caa2e..b8c6c512a5759 100644 --- a/src/wp-includes/class-walker-category-dropdown.php +++ b/src/wp-includes/class-walker-category-dropdown.php @@ -56,7 +56,7 @@ class Walker_CategoryDropdown extends Walker { * See wp_dropdown_categories(). * @param int $current_object_id Optional. ID of the current category. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $category = $data_object; diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php index 24ae740030bdf..227eb7b770519 100644 --- a/src/wp-includes/class-walker-category.php +++ b/src/wp-includes/class-walker-category.php @@ -98,7 +98,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) { * Default empty array. * @param int $current_object_id Optional. ID of the current category. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $category = $data_object; diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php index 588986cdebbad..6c48cc3d30c6a 100644 --- a/src/wp-includes/class-walker-comment.php +++ b/src/wp-includes/class-walker-comment.php @@ -128,7 +128,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) { * @param array $args An array of arguments. * @param string $output Used to append additional content. Passed by reference. */ - public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $all_elements = null ) { + public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $all_elements = array() ) { if ( ! $element ) { return; } @@ -170,7 +170,7 @@ public function display_element( $element, &$children_elements, $max_depth, $dep * @param array $args Optional. An array of arguments. Default empty array. * @param int $current_object_id Optional. ID of the current comment. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $comment = $data_object; diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php index ec2719e898e3f..4125943562d26 100644 --- a/src/wp-includes/class-walker-nav-menu.php +++ b/src/wp-includes/class-walker-nav-menu.php @@ -135,7 +135,7 @@ public function end_lvl( &$output, $depth = 0, $args = null ) { * @param stdClass $args An object of wp_nav_menu() arguments. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = null ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $menu_item = $data_object; diff --git a/src/wp-includes/class-walker-page-dropdown.php b/src/wp-includes/class-walker-page-dropdown.php index 08e52815c4461..3ce2e25c5a977 100644 --- a/src/wp-includes/class-walker-page-dropdown.php +++ b/src/wp-includes/class-walker-page-dropdown.php @@ -59,7 +59,7 @@ class Walker_PageDropdown extends Walker { * See wp_dropdown_pages(). Default empty array. * @param int $current_object_id Optional. ID of the current page. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $page = $data_object; diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php index bb3929a9dddf4..7bb32c312003e 100644 --- a/src/wp-includes/class-walker-page.php +++ b/src/wp-includes/class-walker-page.php @@ -102,7 +102,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) { * @param array $args Optional. Array of arguments. Default empty array. * @param int $current_object_id Optional. ID of the current page. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { // Restores the more descriptive, specific name for use within this method. $page = $data_object; diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php index adeab9e1cf154..257e1683d64f8 100644 --- a/src/wp-includes/class-wp-walker.php +++ b/src/wp-includes/class-wp-walker.php @@ -93,7 +93,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {} * @param array $args An array of additional arguments. * @param int $current_object_id Optional. ID of the current item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {} + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) {} /** * Ends the element output, if needed. @@ -130,7 +130,7 @@ public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {} * @param array $args An array of arguments. * @param string $output Used to append additional content (passed by reference). */ - public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $all_elements = null ) { + public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output, $all_elements = array() ) { if ( ! $element ) { return; } @@ -144,7 +144,7 @@ public function display_element( $element, &$children_elements, $max_depth, $dep $args[0]['has_children'] = $this->has_children; // Back-compat. } - $this->start_el( $output, $element, $depth, array_values( $args ), '', $all_elements ); + $this->start_el( $output, $element, $depth, array_values( $args ), 0, $all_elements); // Descend only when the depth is right and there are children for this element. if ( ( 0 == $max_depth || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) { From 1d8a90f0d535340bedb686ff639762ce24bc9407 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Thu, 7 Mar 2024 01:15:40 +0530 Subject: [PATCH 03/45] Solved Unpack error for start_el --- src/wp-includes/class-wp-walker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php index 257e1683d64f8..f117cfa6a4b71 100644 --- a/src/wp-includes/class-wp-walker.php +++ b/src/wp-includes/class-wp-walker.php @@ -144,7 +144,7 @@ public function display_element( $element, &$children_elements, $max_depth, $dep $args[0]['has_children'] = $this->has_children; // Back-compat. } - $this->start_el( $output, $element, $depth, array_values( $args ), 0, $all_elements); + $this->start_el( $output, $element, $depth, ...array_values( $args ), ...[0], ...[$all_elements]); // Descend only when the depth is right and there are children for this element. if ( ( 0 == $max_depth || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) { From 92e340d6970358d74ac1b11643377404a374e4e2 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Thu, 7 Mar 2024 03:41:47 +0530 Subject: [PATCH 04/45] Parent update code complete --- src/js/_enqueues/lib/nav-menu.js | 33 +++++++++++++++++ .../includes/class-walker-nav-menu-edit.php | 35 ++++++++++++++----- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 9877f7821770c..972e1321a0f2d 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -431,6 +431,39 @@ api.moveMenuItem( $( this ).parents( 'li.menu-item' ).find( 'a.item-edit' ), dir ); } }); + + //Update Parent on changin values. + menu.on( 'change', '.edit-menu-item-parent', function() { + api.changeMenuParent( $( this ) ); + }); + + }, + + /** + * changeMenuParent( [newparent] ) + * + * @param {object} newparent The new parent of menu item + */ + changeMenuParent : function( newParent ) { + var parentItem, parentItemID, parentItemName, + menuItems = $( '#menu-to-edit li' ), + $this = $( newParent ), + newParentID = $this.val(), + menuItem = $this.closest('li.menu-item').first(), + oldDepth = menuItem.menuItemDepth(), + parentItem = $('#menu-item-'+newParentID), + newItemPosition = parseInt( parentItem.index(), 10 ), + parentDepth = parentItem.menuItemDepth(), + newDepth = parseInt(parentDepth) + 1; + + if(newParentID == 0){ + newDepth = 0; + newItemPosition = menuItems.length - 2; + } + + menuItem.find('.menu-item-data-parent-id').val(newParentID); + menuItem.updateDepthClass(newDepth, oldDepth); + menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId(); }, /** diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index b5a25f316242f..4226964babf73 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -262,16 +262,33 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur + + menu_item_parent; ?> -
- - +
+
+ + +
From a2e2679566b0363c9b58ef960723a8ccf8749b5f Mon Sep 17 00:00:00 2001 From: Rcreators Date: Fri, 8 Mar 2024 14:29:29 +0530 Subject: [PATCH 05/45] PHP code update removed for parent dropdown --- .../class-walker-category-checklist.php | 2 +- .../class-walker-nav-menu-checklist.php | 2 +- .../includes/class-walker-nav-menu-edit.php | 12 +++-------- .../class-walker-category-dropdown.php | 2 +- src/wp-includes/class-walker-category.php | 2 +- src/wp-includes/class-walker-comment.php | 4 ++-- src/wp-includes/class-walker-nav-menu.php | 2 +- .../class-walker-page-dropdown.php | 2 +- src/wp-includes/class-walker-page.php | 2 +- src/wp-includes/class-wp-walker.php | 20 +++++++++---------- 10 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/wp-admin/includes/class-walker-category-checklist.php b/src/wp-admin/includes/class-walker-category-checklist.php index ab70c511aea33..1deb3f9206932 100644 --- a/src/wp-admin/includes/class-walker-category-checklist.php +++ b/src/wp-admin/includes/class-walker-category-checklist.php @@ -70,7 +70,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) { * @param array $args An array of arguments. See {@see wp_terms_checklist()}. * @param int $current_object_id Optional. ID of the current term. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0, $all_elements = array() ) { + public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) { // Restores the more descriptive, specific name for use within this method. $category = $data_object; diff --git a/src/wp-admin/includes/class-walker-nav-menu-checklist.php b/src/wp-admin/includes/class-walker-nav-menu-checklist.php index c01ddbb60684c..6fc5c4169048d 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-checklist.php +++ b/src/wp-admin/includes/class-walker-nav-menu-checklist.php @@ -73,7 +73,7 @@ public function end_lvl( &$output, $depth = 0, $args = null ) { * @param stdClass $args Not used. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = array() ) { + public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) { global $_nav_menu_placeholder, $nav_menu_selected_id; // Restores the more descriptive, specific name for use within this method. diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index 4226964babf73..102bcbb3d00bc 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -57,11 +57,10 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {} * @param stdClass $args Not used. * @param int $current_object_id Optional. ID of the current menu item. Default 0. */ - public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0, $all_elements = null ) { + public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) { global $_wp_nav_menu_max_depth; // Restores the more descriptive, specific name for use within this method. - $menu_items = $all_elements; $menu_item = $data_object; $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; @@ -270,18 +269,13 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur * @since 6.6.0 */ ?> - menu_item_parent; ?> +
From 51b3e061f3ed9349ff9ebf2fc9585b13411b08b3 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Fri, 8 Mar 2024 17:30:15 +0530 Subject: [PATCH 10/45] Menu Order Dropdown updating on load and some code formatting --- src/js/_enqueues/lib/nav-menu.js | 88 ++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index ac75dda609e2a..eebe287a457d4 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -293,18 +293,18 @@ updateParentDropdown : function() { return this.each(function(){ var menuItems = $( '#menu-to-edit li' ), - parentDropdown = $( '.edit-menu-item-parent' ); + parentDropdowns = $( '.edit-menu-item-parent' ); - $.each( parentDropdown, function( attr, val ) { + $.each( parentDropdowns, function( attr, val ) { var parentDropdown = $(this), - $html = '', - $selected = '', - currentItemID = parentDropdown.closest('li.menu-item').find('.menu-item-data-db-id').val(), - currentparentID = parentDropdown.closest('li.menu-item').find('.menu-item-data-parent-id').val(); + $html = '', + $selected = '', + currentItemID = parentDropdown.closest('li.menu-item').find('.menu-item-data-db-id').val(), + currentparentID = parentDropdown.closest('li.menu-item').find('.menu-item-data-parent-id').val(); if(currentparentID == 0) $selected = 'selected'; - $html = $html + ''; + $html += ''; $.each( menuItems, function( attr, val ) { var menuItem = $(this), @@ -314,7 +314,7 @@ if(currentItemID != menuID) { if(currentparentID == menuID) $selected = 'selected'; - $html = $html + ''; + $html += ''; } }); @@ -323,6 +323,53 @@ }); }, + updateOrderDropdown : function() { + return this.each(function(){ + var menuItems = $( '#menu-to-edit li' ), + orderDropdowns = $( '.edit-menu-item-order' ); + + $.each( orderDropdowns, function( attr, val ) { + var orderDropdown = $(this), + menuItem = orderDropdown.closest('li.menu-item').first(), + depth = menuItem.menuItemDepth(), + isPrimaryMenuItem = ( 0 === depth ), + position = parseInt( menuItem.index(), 10 ), + prevItemDepth = ( isPrimaryMenuItem ) ? depth : parseInt( depth - 1, 10 ), + totalMenuItems = $('#menu-to-edit li').length, + hasSameDepthSibling = menuItem.nextAll( '.menu-item-depth-' + depth ).length, + $html = ''; + + if ( isPrimaryMenuItem ) { + var primaryItems = $( '.menu-item-depth-0' ), + itemPosition = primaryItems.index( menuItem ) + 1, + totalMenuItems = primaryItems.length; + + for(let i = 1; i < totalMenuItems + 1; i++){ + $selected = ''; + if(i == itemPosition) $selected = 'selected'; + $html += ''; + } + + } else { + var parentItem = menuItem.prevAll( '.menu-item-depth-' + parseInt( depth - 1, 10 ) ).first(), + parentItemId = parentItem.find( '.menu-item-data-db-id' ).val(), + subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemId + '"]' ), + totalSubMenuItems = subItems.length, + itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 1; + + for(let i = 1; i < totalSubMenuItems + 1; i++){ + $selected = ''; + if(i == itemPosition) $selected = 'selected'; + $html += ''; + } + + } + + orderDropdown.html( $html ); + }); + + }); + } }); }, @@ -483,17 +530,17 @@ */ changeMenuParent : function( selectParentDropdown ) { var parentItem, parentItemID, parentItemName, - menuItems = $( '#menu-to-edit li' ), - $this = $( selectParentDropdown ), - newParentID = $this.val(), - menuItem = $this.closest('li.menu-item').first(), - oldDepth = menuItem.menuItemDepth(), - parentItem = $('#menu-item-'+newParentID), - parentPosition = parseInt( parentItem.index(), 10 ), - noOfChild = parseInt( parentItem.childMenuItems().length, 10 ), - newItemPosition = parentPosition + noOfChild, - parentDepth = parentItem.menuItemDepth(), - newDepth = parseInt(parentDepth) + 1; + menuItems = $( '#menu-to-edit li' ), + $this = $( selectParentDropdown ), + newParentID = $this.val(), + menuItem = $this.closest('li.menu-item').first(), + oldDepth = menuItem.menuItemDepth(), + parentItem = $('#menu-item-'+newParentID), + parentPosition = parseInt( parentItem.index(), 10 ), + noOfChild = parseInt( parentItem.childMenuItems().length, 10 ), + newItemPosition = parentPosition + noOfChild, + parentDepth = parentItem.menuItemDepth(), + newDepth = parseInt(parentDepth) + 1; if(newParentID == 0){ newDepth = 0; @@ -502,8 +549,7 @@ menuItem.find('.menu-item-data-parent-id').val(newParentID); menuItem.updateDepthClass(newDepth, oldDepth); - menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId().updateParentDropdown(); - menuItem.find('.edit-menu-item-parent').focus(); + menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId().updateParentDropdown().find('.edit-menu-item-parent').focus(); }, /** From e2af011d8a9fa84b78ccb3cd63e3004b4d872c26 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Fri, 8 Mar 2024 17:44:40 +0530 Subject: [PATCH 11/45] Remove menu item update menu order dropdown --- src/js/_enqueues/lib/nav-menu.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index eebe287a457d4..01c2ca8358b17 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -217,6 +217,7 @@ t.find( '.button-controls .select-all' ).prop( 'checked', false ); t.find( '.button-controls .spinner' ).removeClass( 'is-active' ); t.updateParentDropdown(); + t.updateOrderDropdown(); }); }); }, @@ -1625,6 +1626,7 @@ */ removeMenuItem : function(el) { var children = el.childMenuItems(); + var menu = $( '#menu-to-edit' ); $( document ).trigger( 'menu-removing-item', [ el ] ); el.addClass('deleting').animate({ @@ -1640,6 +1642,7 @@ } api.refreshAdvancedAccessibility(); wp.a11y.speak( menus.itemRemoved ); + menu.updateOrderDropdown(); }); }, From b1c00c443bf911313e9da1de19e4cd3815918d64 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Fri, 8 Mar 2024 19:51:06 +0530 Subject: [PATCH 12/45] Menu Order Change code added --- src/js/_enqueues/lib/nav-menu.js | 61 +++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 01c2ca8358b17..69f1ee27304ea 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -517,22 +517,31 @@ //Set Parents data for all menu items. menu.updateParentDropdown(); + //Set Order data for all menu items. + menu.updateOrderDropdown(); + //Update Parent on changin values. menu.on( 'change', '.edit-menu-item-parent', function() { api.changeMenuParent( $( this ) ); }); + //Update Parent on changin values. + menu.on( 'change', '.edit-menu-item-order', function() { + api.changeMenuOrder( $( this ) ); + }); }, /** - * changeMenuParent( [newparent] ) + * changeMenuParent( [ParentDropdown] ) + * + * @since 6.6.0 * - * @param {object} newparent The new parent of menu item + * @param {object} ParentDropdown select field */ - changeMenuParent : function( selectParentDropdown ) { + changeMenuParent : function( ParentDropdown ) { var parentItem, parentItemID, parentItemName, menuItems = $( '#menu-to-edit li' ), - $this = $( selectParentDropdown ), + $this = $( ParentDropdown ), newParentID = $this.val(), menuItem = $this.closest('li.menu-item').first(), oldDepth = menuItem.menuItemDepth(), @@ -553,6 +562,50 @@ menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateParentMenuItemDBId().updateParentDropdown().find('.edit-menu-item-parent').focus(); }, + /** + * changeMenuOrder( [OrderDropdown] ) + * + * @since 6.6.0 + * + * @param {object} OrderDropdown select field + */ + changeMenuOrder : function( OrderDropdown ) { + var menuItems = $( '#menu-to-edit li' ), + $this = $( OrderDropdown ), + newOrderID = parseInt( $this.val(), 10), + menuItem = $this.closest('li.menu-item').first(), + depth = menuItem.menuItemDepth(), + isPrimaryMenuItem = ( 0 === depth ), + currentItmePosition = parseInt( menuItem.index(), 10 ), + parentItemID = menuItem.find('.menu-item-data-parent-id').val(), + parentItem = $('#menu-item-'+ parentItemID), + parentPosition = parseInt( parentItem.index(), 10 ), + newItemPosition = parentPosition + newOrderID; + + if ( isPrimaryMenuItem ) { + primaryItems = $( '.menu-item-depth-0' ), + currentItemAtPosition = $( primaryItems[newOrderID - 1] ), + newItemPosition = parseInt( currentItemAtPosition.index(), 10 ); + + if(currentItmePosition < newItemPosition) { + noOfChild = parseInt( currentItemAtPosition.childMenuItems().length, 10 ) + if(noOfChild > 0){ + newItemPosition = newItemPosition + noOfChild; + menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); + } else { + newItemPosition = newItemPosition + 1; + menuItem.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); + } + } else { + menuItem.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); + } + + } else { + if(currentItmePosition > newItemPosition) newItemPosition = newItemPosition - 1; + menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); + } + }, + /** * refreshAdvancedAccessibilityOfItem( [itemToRefresh] ) * From 84b9e69abc2831f8285b85cf326c042b0650b617 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Fri, 8 Mar 2024 20:18:43 +0530 Subject: [PATCH 13/45] Some errors code updated --- src/js/_enqueues/lib/nav-menu.js | 20 +++++++------------ .../includes/class-walker-nav-menu-edit.php | 4 +--- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 69f1ee27304ea..5b3a5778af2ee 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -296,7 +296,7 @@ var menuItems = $( '#menu-to-edit li' ), parentDropdowns = $( '.edit-menu-item-parent' ); - $.each( parentDropdowns, function( attr, val ) { + $.each( parentDropdowns, function() { var parentDropdown = $(this), $html = '', $selected = '', @@ -307,7 +307,7 @@ $html += ''; - $.each( menuItems, function( attr, val ) { + $.each( menuItems, function() { var menuItem = $(this), $selected = '', menuID = menuItem.find('.menu-item-data-db-id').val(), @@ -320,24 +320,19 @@ }); parentDropdown.html( $html ); - }) + }); }); }, updateOrderDropdown : function() { return this.each(function(){ - var menuItems = $( '#menu-to-edit li' ), - orderDropdowns = $( '.edit-menu-item-order' ); + var orderDropdowns = $( '.edit-menu-item-order' ); - $.each( orderDropdowns, function( attr, val ) { + $.each( orderDropdowns, function() { var orderDropdown = $(this), menuItem = orderDropdown.closest('li.menu-item').first(), depth = menuItem.menuItemDepth(), isPrimaryMenuItem = ( 0 === depth ), - position = parseInt( menuItem.index(), 10 ), - prevItemDepth = ( isPrimaryMenuItem ) ? depth : parseInt( depth - 1, 10 ), - totalMenuItems = $('#menu-to-edit li').length, - hasSameDepthSibling = menuItem.nextAll( '.menu-item-depth-' + depth ).length, $html = ''; if ( isPrimaryMenuItem ) { @@ -539,8 +534,7 @@ * @param {object} ParentDropdown select field */ changeMenuParent : function( ParentDropdown ) { - var parentItem, parentItemID, parentItemName, - menuItems = $( '#menu-to-edit li' ), + var menuItems = $( '#menu-to-edit li' ), $this = $( ParentDropdown ), newParentID = $this.val(), menuItem = $this.closest('li.menu-item').first(), @@ -588,7 +582,7 @@ newItemPosition = parseInt( currentItemAtPosition.index(), 10 ); if(currentItmePosition < newItemPosition) { - noOfChild = parseInt( currentItemAtPosition.childMenuItems().length, 10 ) + noOfChild = parseInt( currentItemAtPosition.childMenuItems().length, 10 ); if(noOfChild > 0){ newItemPosition = newItemPosition + noOfChild; menuItem.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index a56fb5556043f..cd89a458f8fc6 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -275,13 +275,11 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
@@ -345,4 +343,4 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur Date: Sat, 9 Mar 2024 15:07:33 +0530 Subject: [PATCH 14/45] PHP white space issue --- src/wp-admin/includes/class-walker-nav-menu-edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index cd89a458f8fc6..d51512cfc9c82 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -265,11 +265,11 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur - +
- - - -
-

- - -

-

- - -

-
-
type && false !== $original_title ) : ?>

From e2c538d71a200e1f333ceef62a0e22507d5d7615 Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Sun, 20 Oct 2024 16:05:49 -0500 Subject: [PATCH 36/45] Improve spacing per JS standards & remove deprecated .focus() --- src/js/_enqueues/lib/nav-menu.js | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 28a2ff98b2947..e81b9fd392071 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -556,20 +556,20 @@ menuItems = $( '#menu-to-edit li' ), $this = $( ParentDropdown ), newParentID = $this.val(), - menuItem = $this.closest('li.menu-item').first(), + menuItem = $this.closest( 'li.menu-item' ).first(), menuItemOldDepth = menuItem.menuItemDepth(), menuItemChildren = menuItem.childMenuItems(), menuItemNoChildren = parseInt( menuItem.childMenuItems().length, 10 ), - parentItem = $('#menu-item-'+newParentID), + parentItem = $( '#menu-item-' + newParentID ), parentItemDepth = parentItem.menuItemDepth(), - menuItemNewDepth = parseInt(parentItemDepth) + 1; + menuItemNewDepth = parseInt( parentItemDepth ) + 1; - if(newParentID == 0){ + if ( newParentID == 0 ) { menuItemNewDepth = 0; } - menuItem.find('.menu-item-data-parent-id').val(newParentID); - menuItem.moveHorizontally(menuItemNewDepth, menuItemOldDepth); + menuItem.find( '.menu-item-data-parent-id' ).val( newParentID ); + menuItem.moveHorizontally( menuItemNewDepth, menuItemOldDepth ); if ( menuItemNoChildren > 0 ) { menuItem = menuItem.add( menuItemChildren ); @@ -581,13 +581,13 @@ var parentItemPosition = parseInt( parentItem.index(), 10 ), parentItemNoChild = parseInt( parentItem.childMenuItems().length, 10 ); - if(parentItemNoChild > 0){ + if ( parentItemNoChild > 0 ){ menuItemNewPosition = parentItemPosition + parentItemNoChild; } else { menuItemNewPosition = parentItemPosition; } - if(newParentID == 0){ + if ( newParentID == 0 ) { menuItemNewPosition = menuItems.length - 1; } @@ -596,7 +596,7 @@ api.registerChange(); api.refreshKeyboardAccessibility(); api.refreshAdvancedAccessibility(); - $this.focus(); + $this.trigger( 'focus' ); wp.a11y.speak( menus.parentUpdated, 'polite' ); }, @@ -612,24 +612,24 @@ menuItems = $( '#menu-to-edit li' ), $this = $( OrderDropdown ), newOrderID = parseInt( $this.val(), 10), - menuItem = $this.closest('li.menu-item').first(), + menuItem = $this.closest( 'li.menu-item' ).first(), depth = menuItem.menuItemDepth(), thisItemChildren = menuItem.childMenuItems(), thisItemNoOfChild = thisItemChildren.length, isPrimaryMenuItem = ( 0 === depth ), currentItemPosition = parseInt( menuItem.index(), 10 ), - parentItemID = menuItem.find('.menu-item-data-parent-id').val(), - parentItem = $('#menu-item-'+ parentItemID), + parentItemID = menuItem.find( '.menu-item-data-parent-id' ).val(), + parentItem = $( '#menu-item-' + parentItemID ), parentPosition = parseInt( parentItem.index(), 10 ), newItemPosition = parentPosition + newOrderID, primaryItems = $( '.menu-item-depth-0' ), - currentItemAtPosition = $( primaryItems[newOrderID - 1] ), + currentItemAtPosition = $( primaryItems[ newOrderID - 1 ] ), currentItemAtPositionNoOfChild = parseInt( currentItemAtPosition.childMenuItems().length, 10 ); if ( isPrimaryMenuItem ) { newItemPosition = parseInt( currentItemAtPosition.index(), 10 ); - if(currentItemPosition < newItemPosition) { - if(currentItemAtPositionNoOfChild > 0){ + if ( currentItemPosition < newItemPosition ) { + if ( currentItemAtPositionNoOfChild > 0 ) { newItemPosition = newItemPosition + currentItemAtPositionNoOfChild - thisItemNoOfChild; } menuItemWithChild = menuItem.add( thisItemChildren ); @@ -643,8 +643,8 @@ } } } else { - if(currentItemPosition < newItemPosition) { - if(currentItemAtPositionNoOfChild > 0){ + if ( currentItemPosition < newItemPosition ) { + if ( currentItemAtPositionNoOfChild > 0 ) { newItemPosition = newItemPosition + currentItemAtPositionNoOfChild - thisItemNoOfChild; } else { newItemPosition = newItemPosition + 1; @@ -664,7 +664,7 @@ api.registerChange(); api.refreshKeyboardAccessibility(); api.refreshAdvancedAccessibility(); - $this.focus(); + $this.trigger( 'focus' ); wp.a11y.speak( menus.orderUpdated, 'polite' ); }, From d24f81cee765fd359f1fcf51706321cd6d438c5a Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Sun, 20 Oct 2024 16:16:18 -0500 Subject: [PATCH 37/45] Comments, @since and var camelCase --- src/js/_enqueues/lib/nav-menu.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index e81b9fd392071..ad4598482cf4d 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -527,34 +527,34 @@ } }); - //Set Parents data for all menu items. + // Set menu parents data for all menu items. menu.updateParentDropdown(); - //Set Order data for all menu items. + // Set menu order data for all menu items. menu.updateOrderDropdown(); - //Update Parent on changin values. + // Update menu item parent when value is changed. menu.on( 'change', '.edit-menu-item-parent', function() { api.changeMenuParent( $( this ) ); }); - //Update Parent on changin values. + // Update menu item order when value is changed. menu.on( 'change', '.edit-menu-item-order', function() { api.changeMenuOrder( $( this ) ); }); }, /** - * changeMenuParent( [ParentDropdown] ) + * changeMenuParent( [parentDropdown] ) * - * @since 6.6.0 + * @since 6.7.0 * - * @param {object} ParentDropdown select field + * @param {object} parentDropdown select field */ - changeMenuParent : function( ParentDropdown ) { + changeMenuParent : function( parentDropdown ) { var menuItemNewPosition, menuItems = $( '#menu-to-edit li' ), - $this = $( ParentDropdown ), + $this = $( parentDropdown ), newParentID = $this.val(), menuItem = $this.closest( 'li.menu-item' ).first(), menuItemOldDepth = menuItem.menuItemDepth(), @@ -603,14 +603,14 @@ /** * changeMenuOrder( [OrderDropdown] ) * - * @since 6.6.0 + * @since 6.7.0 * - * @param {object} OrderDropdown select field + * @param {object} orderDropdown select field */ - changeMenuOrder : function( OrderDropdown ) { + changeMenuOrder : function( orderDropdown ) { var menuItemWithChild, menuItems = $( '#menu-to-edit li' ), - $this = $( OrderDropdown ), + $this = $( orderDropdown ), newOrderID = parseInt( $this.val(), 10), menuItem = $this.closest( 'li.menu-item' ).first(), depth = menuItem.menuItemDepth(), From 65b376f5129022f4c0737bf95d3ea4707592d2a8 Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Sun, 20 Oct 2024 16:58:59 -0500 Subject: [PATCH 38/45] Setting newItemPosition to +1 moves items to be children of the next parent --- src/js/_enqueues/lib/nav-menu.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index ad4598482cf4d..48faea001d1fc 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -646,8 +646,6 @@ if ( currentItemPosition < newItemPosition ) { if ( currentItemAtPositionNoOfChild > 0 ) { newItemPosition = newItemPosition + currentItemAtPositionNoOfChild - thisItemNoOfChild; - } else { - newItemPosition = newItemPosition + 1; } menuItemWithChild = menuItem.add( thisItemChildren ); menuItemWithChild.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); From e50fb369c0d7d8bc848c62c508d50095661c55d8 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Mon, 21 Oct 2024 23:24:31 +0530 Subject: [PATCH 39/45] Update logic for Changing Order Completely new logic with sub items list only. --- src/js/_enqueues/lib/nav-menu.js | 62 +++++++++++--------------------- 1 file changed, 21 insertions(+), 41 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 48faea001d1fc..528abcd5f172a 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -613,50 +613,30 @@ $this = $( orderDropdown ), newOrderID = parseInt( $this.val(), 10), menuItem = $this.closest( 'li.menu-item' ).first(), - depth = menuItem.menuItemDepth(), - thisItemChildren = menuItem.childMenuItems(), - thisItemNoOfChild = thisItemChildren.length, - isPrimaryMenuItem = ( 0 === depth ), - currentItemPosition = parseInt( menuItem.index(), 10 ), + menuItemChildren = menuItem.childMenuItems(), + menuItemNoChildren = menuItemChildren.length, + menuItemCurrentPosition = parseInt( menuItem.index(), 10 ); parentItemID = menuItem.find( '.menu-item-data-parent-id' ).val(), - parentItem = $( '#menu-item-' + parentItemID ), - parentPosition = parseInt( parentItem.index(), 10 ), - newItemPosition = parentPosition + newOrderID, - primaryItems = $( '.menu-item-depth-0' ), - currentItemAtPosition = $( primaryItems[ newOrderID - 1 ] ), - currentItemAtPositionNoOfChild = parseInt( currentItemAtPosition.childMenuItems().length, 10 ); + subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemID + '"]' ), + currentItemAtPosition = $(subItems[newOrderID - 1]).closest( 'li.menu-item' ); - if ( isPrimaryMenuItem ) { - newItemPosition = parseInt( currentItemAtPosition.index(), 10 ); - if ( currentItemPosition < newItemPosition ) { - if ( currentItemAtPositionNoOfChild > 0 ) { - newItemPosition = newItemPosition + currentItemAtPositionNoOfChild - thisItemNoOfChild; - } - menuItemWithChild = menuItem.add( thisItemChildren ); - menuItemWithChild.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); - } else { - if ( thisItemChildren ) { - menuItemWithChild = menuItem.add( thisItemChildren ); - menuItemWithChild.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); - } else { - menuItem.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); - } - } + if ( menuItemNoChildren > 0 ) { + menuItem = menuItem.add( menuItemChildren ); + } + + var currentItemNoChildren = currentItemAtPosition.childMenuItems().length, + currentItemPosition = parseInt( currentItemAtPosition.index(), 10 ); + + menuItems = $( '#menu-to-edit li' ); + + var menuItemNewPosition = currentItemPosition; + + if(menuItemCurrentPosition > menuItemNewPosition){ + menuItemNewPosition = currentItemPosition; + menuItem.detach().insertBefore( menuItems.eq( menuItemNewPosition ) ).updateOrderDropdown(); } else { - if ( currentItemPosition < newItemPosition ) { - if ( currentItemAtPositionNoOfChild > 0 ) { - newItemPosition = newItemPosition + currentItemAtPositionNoOfChild - thisItemNoOfChild; - } - menuItemWithChild = menuItem.add( thisItemChildren ); - menuItemWithChild.detach().insertAfter( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); - } else { - if ( thisItemChildren ) { - menuItemWithChild = menuItem.add( thisItemChildren ); - menuItemWithChild.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); - } else { - menuItem.detach().insertBefore( menuItems.eq( newItemPosition ) ).updateOrderDropdown(); - } - } + menuItemNewPosition = menuItemNewPosition + currentItemNoChildren + menuItem.detach().insertAfter( menuItems.eq( menuItemNewPosition ) ).updateOrderDropdown(); } api.registerChange(); From 03c4e021dadfdb48c2bb0b63b73726727559ab4c Mon Sep 17 00:00:00 2001 From: Rcreators Date: Mon, 21 Oct 2024 23:28:19 +0530 Subject: [PATCH 40/45] Minor Js issue. --- src/js/_enqueues/lib/nav-menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 528abcd5f172a..ebf49d677d4e5 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -615,7 +615,7 @@ menuItem = $this.closest( 'li.menu-item' ).first(), menuItemChildren = menuItem.childMenuItems(), menuItemNoChildren = menuItemChildren.length, - menuItemCurrentPosition = parseInt( menuItem.index(), 10 ); + menuItemCurrentPosition = parseInt( menuItem.index(), 10 ), parentItemID = menuItem.find( '.menu-item-data-parent-id' ).val(), subItems = $( '.menu-item .menu-item-data-parent-id[value="' + parentItemID + '"]' ), currentItemAtPosition = $(subItems[newOrderID - 1]).closest( 'li.menu-item' ); From 288c11f9d3a5731aa29bddf941374f28ff52c8ae Mon Sep 17 00:00:00 2001 From: Rcreators Date: Mon, 21 Oct 2024 23:32:40 +0530 Subject: [PATCH 41/45] Removed unused variable --- src/js/_enqueues/lib/nav-menu.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index ebf49d677d4e5..2956f01587201 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -608,8 +608,7 @@ * @param {object} orderDropdown select field */ changeMenuOrder : function( orderDropdown ) { - var menuItemWithChild, - menuItems = $( '#menu-to-edit li' ), + var menuItems = $( '#menu-to-edit li' ), $this = $( orderDropdown ), newOrderID = parseInt( $this.val(), 10), menuItem = $this.closest( 'li.menu-item' ).first(), From 40de312fd51973492cb96706016feb37ac30241d Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Mon, 21 Oct 2024 13:04:31 -0500 Subject: [PATCH 42/45] Remove unused variable --- src/js/_enqueues/lib/nav-menu.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index ebf49d677d4e5..2956f01587201 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -608,8 +608,7 @@ * @param {object} orderDropdown select field */ changeMenuOrder : function( orderDropdown ) { - var menuItemWithChild, - menuItems = $( '#menu-to-edit li' ), + var menuItems = $( '#menu-to-edit li' ), $this = $( orderDropdown ), newOrderID = parseInt( $this.val(), 10), menuItem = $this.closest( 'li.menu-item' ).first(), From ebd2af70c738a93b6fb992a13345ed0e303ae590 Mon Sep 17 00:00:00 2001 From: Rcreators Date: Mon, 21 Oct 2024 23:36:28 +0530 Subject: [PATCH 43/45] Again missing semicolon --- src/js/_enqueues/lib/nav-menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 2956f01587201..a8d3e6081acba 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -634,7 +634,7 @@ menuItemNewPosition = currentItemPosition; menuItem.detach().insertBefore( menuItems.eq( menuItemNewPosition ) ).updateOrderDropdown(); } else { - menuItemNewPosition = menuItemNewPosition + currentItemNoChildren + menuItemNewPosition = menuItemNewPosition + currentItemNoChildren; menuItem.detach().insertAfter( menuItems.eq( menuItemNewPosition ) ).updateOrderDropdown(); } From 4872909606929ec9f9fc8e541fafcd56f5e84ae6 Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Mon, 21 Oct 2024 13:50:22 -0500 Subject: [PATCH 44/45] Expand spacing --- src/js/_enqueues/lib/nav-menu.js | 53 ++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index a8d3e6081acba..be66268a5c087 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -297,37 +297,41 @@ parentDropdowns = $( '.edit-menu-item-parent' ); $.each( parentDropdowns, function() { - var parentDropdown = $(this), + var parentDropdown = $( this ), $html = '', $selected = '', - currentItemID = parentDropdown.closest('li.menu-item').find('.menu-item-data-db-id').val(), - currentparentID = parentDropdown.closest('li.menu-item').find('.menu-item-data-parent-id').val(), - currentItem = parentDropdown.closest('li.menu-item'), + currentItemID = parentDropdown.closest( 'li.menu-item' ).find( '.menu-item-data-db-id' ).val(), + currentparentID = parentDropdown.closest( 'li.menu-item' ).find( '.menu-item-data-parent-id' ).val(), + currentItem = parentDropdown.closest( 'li.menu-item' ), currentMenuItemChild = currentItem.childMenuItems(), - excludeMenuItem = [currentItemID]; + excludeMenuItem = [ currentItemID ]; - if( currentMenuItemChild.length > 0 ){ + if ( currentMenuItemChild.length > 0 ) { $.each( currentMenuItemChild, function(){ var childItem = $(this), - childID = childItem.find('.menu-item-data-db-id').val(); + childID = childItem.find( '.menu-item-data-db-id' ).val(); - excludeMenuItem.push(childID); + excludeMenuItem.push( childID ); }); } - if(currentparentID == 0) $selected = 'selected'; + if ( currentparentID == 0 ) { + $selected = 'selected'; + } $html += ''; $.each( menuItems, function() { var menuItem = $(this), $selected = '', - menuID = menuItem.find('.menu-item-data-db-id').val(), - menuTitle = menuItem.find('.edit-menu-item-title').val(); - - if(!excludeMenuItem.includes(menuID) ) { - if(currentparentID == menuID) $selected = 'selected'; - $html += ''; + menuID = menuItem.find( '.menu-item-data-db-id' ).val(), + menuTitle = menuItem.find( '.edit-menu-item-title' ).val(); + + if ( ! excludeMenuItem.includes( menuID ) ) { + if ( currentparentID == menuID ) { + $selected = 'selected'; + } + $html += ''; } }); @@ -337,13 +341,13 @@ }); }, updateOrderDropdown : function() { - return this.each(function(){ + return this.each( function() { var itemPosition, orderDropdowns = $( '.edit-menu-item-order' ); $.each( orderDropdowns, function() { - var orderDropdown = $(this), - menuItem = orderDropdown.closest('li.menu-item').first(), + var orderDropdown = $( this ), + menuItem = orderDropdown.closest( 'li.menu-item' ).first(), depth = menuItem.menuItemDepth(), isPrimaryMenuItem = ( 0 === depth ), $html = '', @@ -355,9 +359,11 @@ itemPosition = primaryItems.index( menuItem ) + 1; - for(let i = 1; i < totalMenuItems + 1; i++){ + for ( let i = 1; i < totalMenuItems + 1; i++ ) { $selected = ''; - if(i == itemPosition) $selected = 'selected'; + if ( i == itemPosition ) { + $selected = 'selected'; + } $html += ''; } @@ -369,9 +375,11 @@ itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 1; - for(let i = 1; i < totalSubMenuItems + 1; i++){ + for ( let i = 1; i < totalSubMenuItems + 1; i++ ) { $selected = ''; - if(i == itemPosition) $selected = 'selected'; + if ( i == itemPosition ) { + $selected = 'selected'; + } $html += ''; } @@ -390,7 +398,6 @@ }, moveMenuItem : function( $this, dir ) { - var items, newItemPosition, newDepth, menuItems = $( '#menu-to-edit li' ), menuItemsCount = menuItems.length, From 123e75ae6290f264dcf3595d9f150791b9f849bc Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Mon, 21 Oct 2024 14:32:09 -0500 Subject: [PATCH 45/45] Ensure flex items expand to full width. --- src/wp-admin/css/nav-menus.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css index 7a64a14d5ae77..f34a014ac7c33 100644 --- a/src/wp-admin/css/nav-menus.css +++ b/src/wp-admin/css/nav-menus.css @@ -832,6 +832,10 @@ body.menu-max-depth-11 { min-width: 1280px !important; } column-gap: 10px; } +.description-group > * { + flex-grow: 1; +} + .menu-item-actions { padding-top: 15px; padding-bottom: 7px;