Changeset 14852 for trunk/wp-admin/nav-menus.php

Timestamp:

05/24/2010 07:50:20 PM (16 years ago)

Author:

nacin

Message:

First pass on better UX for menu item save. props koopersmith, see #13525.

File:

• trunk/wp-admin/nav-menus.php (modified) (4 diffs)

trunk/wp-admin/nav-menus.php

@@ -319 +319 @@
 
                         if ( ! is_wp_error( $_menu_object ) ) {
-                                $menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
+                                $unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
+                                $menu_items = array();
+                                // Index menu items by db ID
+                                foreach( $unsorted_menu_items as $_item )
+                                        $menu_items[$_item->db_id] = $_item;
+
                                 $post_fields = array( 'menu-item-db-id', 'menu-item-object-id', 'menu-item-object', 'menu-item-parent-id', 'menu-item-position', 'menu-item-type', 'menu-item-title', 'menu-item-url', 'menu-item-description', 'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn' );
                                 wp_defer_term_counting(true);
@@ -357 +362 @@
 
                                 $messages[] = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been updated.'), $nav_menu_selected_title ) . '</p></div>';
-                                unset( $menu_items );
+                                unset( $menu_items, $unsorted_menu_items );
                         }
                 }
@@ -411 +416 @@
         wp_nav_menu_setup();
         $messages[] = '<div id="message" class="error"><p>' . __('The current theme does not natively support menus, but you can use the &#8220;Navigation Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p></div>';
-
-// The theme supports neither menus nor widgets.
-} else {
-        remove_meta_box( 'create-menu', 'nav-menus', 'side' );
-        $messages[] = '<div id="message" class="error"><p>' . __('The current theme does not support menus.') . '</p></div>';
 }
 
@@ -513 +513 @@
                                                         </div><!--END .major-publishing-actions-->
                                                 </div><!--END #submitpost .submitbox-->
-                                                <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-                                                <?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-                                                <?php wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' ); ?>
+                                                <?php
+                                                wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+                                                wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+                                                wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' );
+                                                ?>
                                                 <input type="hidden" name="action" value="update" />
                                                 <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />