Changeset 14974

Timestamp:

05/27/2010 02:49:11 AM (15 years ago)

Author:

nacin

Message:

Implement the Cancel menu item link for no JS. props ocean90, see #13525.

File:

• trunk/wp-admin/includes/nav-menu.php (modified) (2 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -94 +94 @@
                         </span>
                         <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php _e('Edit Menu Item'); ?>" href="<?php
-                            echo add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) );
-                        ?>#menu-item-settings-<?php echo $item_id; ?>">Edit Menu Item</a>
+                            echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
+                        ?>">Edit Menu Item</a>
                     </span>
                 </dt>
@@ -169 +169 @@
                         ),
                         'delete-menu_item_' . $item_id
-                    ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo admin_url( 'nav-menus.php' ); ?>"><?php _e('Cancel'); ?></a>
+                    ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) );
+                        ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
                 </div>