Index: wp-includes/nav-menu-template.php =================================================================== --- wp-includes/nav-menu-template.php (revision 14247) +++ wp-includes/nav-menu-template.php (working copy) @@ -8,6 +8,160 @@ */ /** + * Create HTML list of nav menu items. + * + * @package WordPress + * @since 3.0.0 + * @uses Walker + */ +class Walker_Nav_Menu extends Walker { + /** + * @see Walker::$tree_type + * @since 3.0.0 + * @var string + */ + var $tree_type = array( 'post_type', 'taxonomy', 'custom' ); + + /** + * @see Walker::$db_fields + * @since 3.0.0 + * @todo Decouple this. + * @var array + */ + var $db_fields = array( 'parent' => 'post_parent', 'id' => 'object_id' ); + + /** + * @see Walker::start_lvl() + * @since 3.0.0 + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Depth of page. Used for padding. + */ + function start_lvl(&$output, $depth) { + $indent = str_repeat("\t", $depth); + $output .= "\n$indent\n"; + } + + /** + * @see Walker::start_el() + * @since 3.0.0 + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $item Menu item data object. + * @param int $depth Depth of menu item. Used for padding. + * @param int $current_page Menu item ID. + * @param object $args + */ + function start_el(&$output, $item, $depth, $args) { + global $wp_query; + $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; + + $classes = $value = ''; + + $classes = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes ); + + if ( 'custom' != $item->object ) + $classes[] = 'menu-item-object-'. $item->object; + + if ( $item->object_id == $wp_query->get_queried_object_id() ) + $classes[] = 'current-menu-item'; + + // @todo add classes for parent/child relationships + + $classes = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) ); + $classes = ' class="' . esc_attr( $classes ) . '"'; + + $output .= $indent . '\n"; + } +} + +/** + * Create HTML list of nav menu input items. + * + * @package WordPress + * @since 3.0.0 + * @uses Walker_Nav_Menu + */ +class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { + + /** + * @see Walker::start_el() + * @since 3.0.0 + * + * @param string $output Passed by reference. Used to append additional content. + * @param object $item Menu item data object. + * @param int $depth Depth of menu item. Used for padding. + * @param int $current_page Menu item ID. + * @param object $args + */ + function start_el(&$output, $item, $depth, $args) { + static $_placeholder; + $_placeholder = 0 > $_placeholder ? $_placeholder - 1 : -1; + $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_placeholder; + $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0; + + $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; + + $output .= $indent . '
  • '; + $output .= ''; + + // Menu item hidden fields + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= ''; + } +} + +/** * Displays a navigation menu. * * Optional $args contents: @@ -17,9 +171,6 @@ * menu_class - CSS class to use for the div container of the menu list. Defaults to 'menu'. * format - Whether to format the ul. Defaults to 'div'. * fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'. - * container - Type of container tag. Avalible options div, p, or nav. Defaults to 'div'. - * container_class - Chooses a class for the container. - * container_id - Chooses an id for the container. * before - Text before the link text. * after - Text after the link text. * link_before - Text before the link. @@ -33,7 +184,7 @@ * @param array $args Arguments */ function wp_nav_menu( $args = array() ) { - $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'echo' => true, + $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'depth' => 0, 'walker' => '', 'context' => 'frontend' ); @@ -46,7 +197,7 @@ // If we couldn't find a menu based off the name, id or slug, // get the first menu that has items. - if ( !$menu ) { + if ( ! $menu ) { $menus = wp_get_nav_menus(); foreach ( $menus as $menu_maybe ) { if ( wp_get_nav_menu_items($menu_maybe->term_id) ) { @@ -56,9 +207,9 @@ } } - // If the menu exists, get it's items. - if ( $menu && !is_wp_error($menu) ) - $menu_items = wp_get_nav_menu_items( $menu->term_id, $args->context ); + // If the menu exists, get its items. + if ( $menu && ! is_wp_error($menu) ) + $menu_items = wp_get_nav_menu_items( $menu->term_id ); // If no menu was found or if the menu has no items, call the fallback_cb if ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) { @@ -73,15 +224,15 @@ if ( in_array( $args->container, $container_allowedtags ) ) { $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : ' class="menu-'. $menu->slug .'-container"'; - $container_id = $args->container_id ? ' id="' . esc_attr($args->container_id) . '"' : '' ; - $nav_menu .= '<'. $args->container . $class . $container_id .'>'; + $nav_menu .= '<'. $args->container . $class .'>'; } // Set up the $menu_item variables + $sorted_menu_items = array(); foreach ( (array) $menu_items as $key => $menu_item ) - $menu_items[$menu_item->menu_order] = wp_setup_nav_menu_item( $menu_item, 'frontend' ); + $sorted_menu_items[$menu_item->menu_order] = wp_setup_nav_menu_item( $menu_item ); - $items .= walk_nav_menu_tree( $menu_items, $args->depth, $args ); + $items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args ); // Attributes $attributes = ' id="menu-' . $menu->slug . '"'; @@ -112,83 +263,17 @@ } /** - * Returns the menu item formatted based on it's context. + * Retrieve the HTML list content for nav menu items. * - * @since 3.0.0 - * - * @param string $menu_item The menu item to format. - * @param string $context The context to which the menu item will be formatted to. - * @param string $args Optional. Args used for the 'template' context. - * @return string $output The menu formatted menu item. + * @uses Walker_Nav_Menu to create HTML list content. + * @since 2.1.0 + * @see Walker::walk() for parameters and return description. */ -function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array() ) { - $output = ''; - switch ( $context ) { - case 'frontend': - $attributes = ! empty( $menu_item->attr_title ) ? ' title="' . esc_attr( $menu_item->attr_title ) .'"' : ''; - $attributes .= ! empty( $menu_item->target ) ? ' target="' . esc_attr( $menu_item->target ) .'"' : ''; - $attributes .= ! empty( $menu_item->xfn ) ? ' rel="' . esc_attr( $menu_item->xfn ) .'"' : ''; - $attributes .= ! empty( $menu_item->url ) ? ' href="' . esc_attr( $menu_item->url ) .'"' : ''; +function walk_nav_menu_tree( $items, $depth, $r ) { + $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker; + $args = array( $items, $depth, $r ); - $output .= $args->before; - $output .= ''; - $output .= $args->link_before . apply_filters( 'the_title', $menu_item->title ) . $args->link_after; - $output .= ''; - $output .= $args->after; + return call_user_func_array( array(&$walker, 'walk'), $args ); +} - break; - - case 'backend': - $output .= '
    '; - $output .= ''. esc_html( $menu_item->title ) .''; - $output .= ''; - $output .= ''. esc_html( $menu_item->append ) .''; - - // Actions - $output .= ''. __('Edit') .' | '; - $output .= ''. __('Delete') .''; - - $output .= '
    '; - - // Menu Item Settings - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - break; - - case 'custom': - case 'taxonomy': - case 'post_type': - $output .= ''; - - // Menu item hidden fields - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - break; - } - - return apply_filters( 'wp_get_nav_menu_item', $output, $context, $args ); -} -?> \ No newline at end of file +?> Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (revision 14247) +++ wp-includes/post.php (working copy) @@ -2190,7 +2190,7 @@ $data = stripslashes_deep( $data ); $where = array( 'ID' => $post_ID ); - if ($update) { + if ( $update ) { do_action( 'pre_post_update', $post_ID ); if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) { if ( $wp_error ) @@ -2265,7 +2265,7 @@ wp_transition_post_status($data['post_status'], $previous_status, $post); - if ( $update) + if ( $update ) do_action('edit_post', $post_ID, $post); do_action('save_post', $post_ID, $post); Index: wp-includes/classes.php =================================================================== --- wp-includes/classes.php (revision 14247) +++ wp-includes/classes.php (working copy) @@ -1124,102 +1124,6 @@ } /** - * Create HTML list of nav menu items. - * - * @package WordPress - * @since 3.0.0 - * @uses Walker - */ -class Walker_Nav_Menu extends Walker { - /** - * @see Walker::$tree_type - * @since 3.0.0 - * @var string - */ - var $tree_type = array( 'post_type', 'taxonomy', 'custom' ); - - /** - * @see Walker::$db_fields - * @since 3.0.0 - * @todo Decouple this. - * @var array - */ - var $db_fields = array( 'parent' => 'post_parent', 'id' => 'object_id' ); - - /** - * @see Walker::start_lvl() - * @since 3.0.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param int $depth Depth of page. Used for padding. - */ - function start_lvl(&$output, $depth) { - $indent = str_repeat("\t", $depth); - $output .= "\n$indent\n"; - } - - /** - * @see Walker::start_el() - * @since 3.0.0 - * - * @param string $output Passed by reference. Used to append additional content. - * @param object $item Menu item data object. - * @param int $depth Depth of menu item. Used for padding. - * @param int $current_page Menu item ID. - * @param object $args - */ - function start_el(&$output, $item, $depth, $args) { - $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; - - $classes = $value = ''; - if ( 'frontend' == $args->context ) { - global $wp_query; - - $classes = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes ); - - if ( 'custom' != $item->object ) - $classes[] = 'menu-item-object-'. $item->object; - - if ( $item->object_id == $wp_query->get_queried_object_id() ) - $classes[] = 'current-menu-item'; - - // @todo add classes for parent/child relationships - - $classes = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) ); - $classes = ' class="' . esc_attr( $classes ) . '"'; - } else { - $value = ' value="' . $item->ID . '"'; - } - - $output .= $indent . '
    • \n"; - } -} - -/** * Create HTML list of pages. * * @package WordPress Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 14247) +++ wp-includes/script-loader.php (working copy) @@ -393,12 +393,13 @@ ) ); // Custom Navigation - $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100403' ); + $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100426' ); $scripts->localize( 'nav-menu', 'navMenuL10n', array( 'custom' => _x('Custom', 'menu nav item type'), 'thickbox' => _x('Edit Menu Item', 'Thickbox Title'), 'edit' => _x('Edit', 'menu item edit text'), - 'warnDelete' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), + 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), + 'warnDeleteMenuItem' => __( "You are about to permanently delete this menu item. \n 'Cancel' to stop, 'OK' to delete." ), ) ); $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20100321' ); @@ -472,7 +473,7 @@ $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); - $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100322' ); + $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100426' ); foreach ( $rtl_styles as $rtl_style ) { $styles->add_data( $rtl_style, 'rtl', true ); Index: wp-includes/nav-menu.php =================================================================== --- wp-includes/nav-menu.php (revision 14247) +++ wp-includes/nav-menu.php (working copy) @@ -16,7 +16,22 @@ * @return mixed $menu|false Or WP_Error */ function wp_get_nav_menu_object( $menu ) { - return is_nav_menu( $menu ); + if ( ! $menu ) + return false; + + $menu_obj = get_term( $menu, 'nav_menu' ); + + if ( ! $menu_obj ) + $menu_obj = get_term_by( 'slug', $menu, 'nav_menu' ); + + if ( ! $menu_obj ) + $menu_obj = get_term_by( 'name', $menu, 'nav_menu' ); + + if ( ! $menu_obj ) { + $menu_obj = false; + } + + return $menu_obj; } /** @@ -27,25 +42,18 @@ * @since 3.0.0 * * @param int|string $menu The menu to check - * @return mixed Menu Object, if it exists. Else, false or WP_Error + * @return bool Whether the menu exists. */ function is_nav_menu( $menu ) { - if ( !$menu ) + if ( ! $menu ) return false; + + $menu_obj = wp_get_nav_menu_object( $menu ); - $menu_obj = get_term( $menu, 'nav_menu' ); - - if ( !$menu_obj ) - $menu_obj = get_term_by( 'slug', $menu, 'nav_menu' ); - - if ( !$menu_obj ) - $menu_obj = get_term_by( 'name', $menu, 'nav_menu' ); - - if ( !$menu_obj ) { - $menu_obj = false; - } - - return $menu_obj; + if ( $menu_obj && ! is_wp_error( $menu_obj ) && ! empty( $menu_obj->term_id ) ) + return true; + + return false; } /** @@ -96,7 +104,7 @@ */ function wp_delete_nav_menu( $menu ) { $menu = wp_get_nav_menu_object( $menu ); - if ( !$menu ) + if ( ! $menu ) return false; $menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' ); @@ -117,6 +125,151 @@ } /** + * Save the properties of a menu or create a new menu with those properties. + * + * @since 3.0.0 + * + * @param int $menu_id The ID of the menu + * @param array $menu_data The array of menu data. + * @return int The menu's ID. + */ +function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) { + $menu_id = (int) $menu_id; + + $_menu = wp_get_nav_menu_object( $menu_id ); + + // menu doesn't already exist + if ( ! $_menu || is_wp_error( $_menu ) ) { + $_menu = wp_create_nav_menu( $menu_data['menu-name'] ); + } + + if ( $_menu && isset( $_menu->term_id ) && ! is_wp_error( $_menu ) ) { + $args = array( + 'description' => ( isset( $menu_data['description'] ) ? $menu_data['description'] : '' ), + 'name' => ( isset( $menu_data['menu-name'] ) ? $menu_data['menu-name'] : '' ), + 'parent' => ( isset( $menu_data['parent'] ) ? (int) $menu_data['parent'] : 0 ), + 'slug' => null, + ); + + $menu_id = (int) $_menu->term_id; + + $update_response = wp_update_term( $menu_id, 'nav_menu', $args ); + + if ( ! is_wp_error( $update_response ) ) { + return $menu_id; + } + } else { + return 0; + } +} + +/** + * Save the properties of a menu item or create a new one. + * + * @since 3.0.0 + * + * @param int $menu_id The ID of the menu. Required. + * @param int $menu_item_db_id The ID of the menu item. If "0", creates a new menu item. + * @param array $menu_item_data The menu item's data. + * @return int The menu item's database ID or WP_Error object on failure. + */ +function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item_data = array() ) { + + $menu_id = (int) $menu_id; + $menu_item_db_id = (int) $menu_item_db_id; + + $menu = wp_get_nav_menu_object( $menu_id ); + + if ( ! $menu || is_wp_error( $menu ) ) { + return $menu; + } + + $menu_items = (array) wp_get_nav_menu_items( $menu_id ); + + $count = count( $menu_items ); + + $defaults = array( + 'menu-item-db-id' => $menu_item_db_id, + 'menu-item-object-id' => 0, + 'menu-item-object' => '', + 'menu-item-parent-id' => 0, + 'menu-item-position' => 0, + 'menu-item-type' => 'custom', + 'menu-item-append' => 'custom', + 'menu-item-title' => '', + 'menu-item-url' => '', + 'menu-item-description' => '', + 'menu-item-attr-title' => '', + 'menu-item-target' => '', + 'menu-item-classes' => '', + 'menu-item-xfn' => '', + ); + + $args = wp_parse_args( $menu_item_data, $defaults ); + + if ( 0 == (int) $args['menu-item-position'] ) { + $last_item = array_pop( $menu_items ); + if ( $last_item && isset( $last_item->ID ) ) { + $last_data = get_post( $last_item->ID ); + if ( ! is_wp_error( $last_data ) && isset( $last_data->menu_order ) ) { + $args['menu-item-position'] = 1 + (int) $last_data->menu_order; + } + + } else { + $args['menu-item-position'] = $count; + } + } + + // Populate the menu item object + $post = array( + 'menu_order' => $args['menu-item-position'], + 'ping_status' => 0, + 'post_content' => $args['menu-item-description'], + 'post_excerpt' => $args['menu-item-attr-title'], + 'post_parent' => $args['menu-item-parent-id'], + 'post_status' => 'publish', + 'post_title' => $args['menu-item-title'], + 'post_type' => 'nav_menu_item', + 'tax_input' => array( 'nav_menu' => $menu->name ), + ); + + // New menu item + if ( 0 == $menu_item_db_id ) { + $menu_item_db_id = wp_insert_post( $post ); + + // Update existing menu item + } else { + $post['ID'] = $menu_item_db_id; + wp_update_post( $post ); + } + + if ( 'custom' == $args['menu-item-type'] ) { + $args['menu-item-object-id'] = $menu_item_db_id; + $args['menu-item-object'] = 'custom'; + } + + if ( $menu_item_db_id && ! is_wp_error( $menu_item_db_id ) ) { + + $menu_item_db_id = (int) $menu_item_db_id; + + update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key($args['menu-item-type']) ); + update_post_meta( $menu_item_db_id, '_menu_item_object_id', (int) $args['menu-item-object-id'] ); + update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) ); + update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) ); + // @todo handle sanitizing multiple classes separated by whitespace. + update_post_meta( $menu_item_db_id, '_menu_item_classes', sanitize_html_class($args['menu-item-classes']) ); + update_post_meta( $menu_item_db_id, '_menu_item_xfn', sanitize_html_class($args['menu-item-xfn']) ); + + // @todo: only save custom link urls. + update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) ); + + do_action('wp_update_nav_menu_item', $menu_id, $menu_item_db_id, $args ); + } + + return $menu_item_db_id; +} + +/** * Returns all navigation menu objects. * * @since 3.0.0 @@ -127,7 +280,44 @@ return get_terms( 'nav_menu', array( 'hide_empty' => false, 'orderby' => 'id' ) ); } + /** + * Sort menu items by the desired key. + * + * @since 3.0.0 + * @access private + * + * @param object $a The first object to compare + * @param object $b The second object to compare + * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b. + */ +function _sort_nav_menu_items($a, $b) { + global $_menu_item_sort_prop; + + if ( empty( $_menu_item_sort_prop ) ) { + return 0; + } + + if ( isset( $a->$_menu_item_sort_prop ) && isset( $b->$_menu_item_sort_prop ) ) { + $_a = (int) $a->$_menu_item_sort_prop; + $_b = (int) $b->$_menu_item_sort_prop; + + if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop ) { + return 0; + } elseif ( + ( $_a == $a->$_menu_item_sort_prop ) && + ( $_b == $b->$_menu_item_sort_prop ) + ) { + return $_a < $_b ? -1 : 1; + } else { + return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop ); + } + } else { + return 0; + } +} + +/** * Returns all menu items of a navigation menu. * * @since 3.0.0 @@ -139,13 +329,13 @@ function wp_get_nav_menu_items( $menu, $args = array() ) { $menu = wp_get_nav_menu_object( $menu ); - if ( !$menu ) + if ( ! $menu ) return false; - + $items = get_objects_in_term( $menu->term_id, 'nav_menu' ); if ( ! empty( $items ) ) { - $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' ); + $defaults = array( 'order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' ); $args = wp_parse_args( $args, $defaults ); if ( count( $items ) > 1 ) $args['include'] = implode( ',', $items ); @@ -155,50 +345,48 @@ $items = get_posts( $args ); if ( ARRAY_A == $args['output'] ) { - $output = array(); - foreach ( $items as $item ) { - $output[$item->$args['output_key']] = $item; + $GLOBALS['_menu_item_sort_prop'] = $args['output_key']; + usort($items, '_sort_nav_menu_items'); + $i = 1; + foreach( $items as $k => $item ) { + $items[$k]->$args['output_key'] = $i++; } - unset( $items ); - ksort( $output ); - return $output; } } return $items; } /** - * Retrieve the HTML list content for nav menu items. + * Decorates a menu item object with the shared navigation menu item properties. * - * @uses Walker_Nav_Menu to create HTML list content. - * @since 2.1.0 - * @see Walker::walk() for parameters and return description. - */ -function walk_nav_menu_tree( $items, $depth, $r ) { - $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker; - $args = array( $items, $depth, $r ); - - return call_user_func_array( array(&$walker, 'walk'), $args ); -} - -/** - * Adds all the navigation menu properties to the menu item. + * Properties: + * - db_id: The DB ID of the this item as a nav_menu_item object, if it exists (0 if it doesn't exist). + * - object_id: The DB ID of the original object this menu item represents, e.g. ID for posts and term_id for categories. + * - type: The family of objects originally represented, such as "post_type" or "taxonomy." + * - object: The type of object originally represented, such as "category," "post", or "attachment." + * - append: The singular label used to describe this type of menu item. + * - parent: The DB ID of the original object's parent object, if any (0 otherwise). + * - url: The URL to which this menu item points. + * - title: The title of this menu item. + * - target: The target attribute of the link element for this menu item. + * - attr_title: The title attribute of the link element for this menu item. + * - classes: The class attribute value for the link element of this menu item. + * - xfn: The XFN relationship expressed in the link of this menu item. + * - description: The description of this menu item. * * @since 3.0.0 * - * @param string $menu_item The menu item to modify - * @param string $menu_item_type The menu item type (frontend, custom, post_type, taxonomy). - * @param string $menu_item_object Optional. The menu item object type (post type or taxonomy). - * @return object $menu_item The modified menu item. + * @param object $menu_item The menu item to modify. + * @return object $menu_item The menu item with standard menu item properties. */ -function wp_setup_nav_menu_item( $menu_item, $menu_item_type = null, $menu_item_object = '' ) { - switch ( $menu_item_type ) { - case 'frontend': +function wp_setup_nav_menu_item( $menu_item ) { + if ( isset( $menu_item->post_type ) ) { + if ( 'nav_menu_item' == $menu_item->post_type ) { $menu_item->db_id = (int) $menu_item->ID; $menu_item->object_id = get_post_meta( $menu_item->ID, '_menu_item_object_id', true ); $menu_item->object = get_post_meta( $menu_item->ID, '_menu_item_object', true ); $menu_item->type = get_post_meta( $menu_item->ID, '_menu_item_type', true ); - + if ( 'post_type' == $menu_item->type ) { $object = get_post_type_object( $menu_item->object ); $menu_item->append = $object->singular_label; @@ -213,7 +401,7 @@ $menu_item->append = __('Custom'); $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true ); } - + $menu_item->title = $menu_item->post_title; $menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true ); @@ -222,31 +410,12 @@ $menu_item->classes = get_post_meta( $menu_item->ID, '_menu_item_classes', true ); $menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true ); - break; - - case 'custom': + } else { $menu_item->db_id = 0; $menu_item->object_id = (int) $menu_item->ID; - $menu_item->object = 'custom'; - $menu_item->type = 'custom'; - $menu_item->append = __('custom'); + $menu_item->type = 'post_type'; - $menu_item->attr_title = strip_tags( $menu_item->post_excerpt ); - $menu_item->description = strip_tags( $menu_item->post_content ); - - $menu_item->title = $menu_item->post_title; - $menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true ); - $menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true ); - $menu_item->classes = get_post_meta( $menu_item->ID, '_menu_item_target', true ); - $menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true ); - break; - - case 'post_type': - $menu_item->db_id = 0; - $menu_item->object_id = (int) $menu_item->ID; - $menu_item->type = $menu_item_type; - - $object = get_post_type_object( $menu_item_object ); + $object = get_post_type_object( $menu_item->post_type ); $menu_item->object = $object->name; $menu_item->append = strtolower( $object->singular_label ); @@ -254,33 +423,32 @@ $menu_item->url = get_permalink( $menu_item->ID ); $menu_item->target = ''; - $menu_item->attr_title = ''; + $menu_item->attr_title = strip_tags( $menu_item->post_excerpt ); $menu_item->description = strip_tags( $menu_item->post_content ); $menu_item->classes = ''; $menu_item->xfn = ''; - break; + } + } elseif ( isset( $menu_item->taxonomy ) ) { + $menu_item->ID = $menu_item->term_id; + $menu_item->db_id = 0; + $menu_item->object_id = (int) $menu_item->term_id; + $menu_item->post_parent = (int) $menu_item->parent; + $menu_item->type = 'taxonomy'; - case 'taxonomy': - $menu_item->ID = $menu_item->term_id; - $menu_item->db_id = 0; - $menu_item->object_id = (int) $menu_item->term_id; - $menu_item->post_parent = (int) $menu_item->parent; - $menu_item->type = $menu_item_type; + $object = get_taxonomy( $menu_item->taxonomy ); + $menu_item->object = $object->name; + $menu_item->append = strtolower( $object->singular_label ); - $object = get_taxonomy( $menu_item_object ); - $menu_item->object = $object->name; - $menu_item->append = strtolower( $object->singular_label ); + $menu_item->title = $menu_item->name; + $menu_item->url = get_term_link( $menu_item, $menu_item->taxonomy ); + $menu_item->target = ''; + $menu_item->attr_title = ''; + $menu_item->description = strip_tags( get_term_field( 'description', $menu_item->term_id, $menu_item->taxonomy ) ); + $menu_item->classes = ''; + $menu_item->xfn = ''; - $menu_item->title = $menu_item->name; - $menu_item->url = get_term_link( $menu_item, $menu_item_object ); - $menu_item->target = ''; - $menu_item->attr_title = ''; - $menu_item->description = ''; - $menu_item->classes = ''; - $menu_item->xfn = ''; - break; } - - return apply_filters( 'wp_setup_nav_menu_item', $menu_item, $menu_item_type, $menu_item_object ); + + return apply_filters( 'wp_setup_nav_menu_item', $menu_item ); } -?> \ No newline at end of file +?> Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 14247) +++ wp-admin/admin-ajax.php (working copy) @@ -126,11 +126,21 @@ check_ajax_referer( "image_editor-$post_id" ); include_once( ABSPATH . 'wp-admin/includes/image-edit.php' ); - if ( !stream_preview_image($post_id) ) + if ( ! stream_preview_image($post_id) ) die('-1'); die(); break; +case 'menu-quick-search': + if ( ! current_user_can( 'switch_themes' ) ) + die('-1'); + + require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + + _wp_ajax_menu_quick_search( $_REQUEST ); + + exit; + break; case 'oembed-cache' : $return = ( $wp_embed->cache_oembed( $_GET['post'] ) ) ? '1' : '0'; die( $return ); @@ -386,6 +396,17 @@ else die('0'); break; +case 'delete-menu-item' : + $menu_item_id = (int) $_POST['menu-item']; + check_admin_referer( 'delete-menu_item_' . $menu_item_id ); + if ( ! current_user_can( 'switch_themes' ) ) + die('-1'); + + if ( 'nav_menu_item' == get_post_type( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) + die('1'); + else + die('0'); + break; case 'delete-meta' : check_ajax_referer( "delete-meta_$id" ); if ( !$meta = get_post_meta_by_id( $id ) ) @@ -795,6 +816,40 @@ $x->send(); break; +case 'add-menu-item' : + if ( ! current_user_can( 'switch_themes' ) ) + die('-1'); + + check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' ); + + require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + + $menu_id = (int) $_POST['menu']; + if ( isset( $_POST['menu-item'] ) ) { + $item_ids = wp_save_nav_menu_item( $menu_id, $_POST['menu-item'] ); + } else { + $item_ids = array(); + } + + foreach ( (array) $item_ids as $menu_item_id ) { + $menu_obj = get_post( $menu_item_id ); + if ( ! empty( $menu_obj->ID ) ) { + $menu_items[] = wp_setup_nav_menu_item( $menu_obj ); + } + } + + if ( ! empty( $menu_items ) ) { + $args = array( + 'after' => '', + 'before' => '', + 'context' => 'backend', + 'link_after' => '', + 'link_before' => '', + 'walker' => new Walker_Nav_Menu_Edit, + ); + echo walk_nav_menu_tree( $menu_items, 0, (object) $args ); + } + break; case 'add-meta' : check_ajax_referer( 'add-meta' ); $c = 0; @@ -1033,6 +1088,16 @@ die('1'); break; +case 'menu-quick-search': + if ( ! current_user_can( 'switch_themes' ) ) + die('-1'); + + require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + + _wp_ajax_menu_quick_search( $_REQUEST ); + + exit; + break; case 'meta-box-order': check_ajax_referer( 'meta-box-order' ); $order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false; Index: wp-admin/includes/nav-menu.php =================================================================== --- wp-admin/includes/nav-menu.php (revision 14247) +++ wp-admin/includes/nav-menu.php (working copy) @@ -1,13 +1,268 @@ ID ); + $removed_args = array( + 'action', + 'customlink-tab', + 'edit-menu-item', + 'menu-item', + 'page-tab', + '_wpnonce', + ); + ?> +
  • '. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'
    • '; - $pt_names = ''; - if ( is_array($posts) ) { - foreach ( $posts as $post ) { - if ( $post->post_title ) { - $pt_names .= htmlentities( $post->post_title ) .'|'; - } - } + $current_tab = 'search'; + if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) { + $current_tab = $_REQUEST[$post_type_name . '-tab']; } - $id = $post_type['args']->name; + if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) { + $current_tab = 'search'; + } + + $removed_args = array( + 'action', + 'customlink-tab', + 'edit-menu-item', + 'menu-item', + 'page-tab', + '_wpnonce', + ); + ?> -

    - - -

    +
    + -

    - - - - +

    + $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) ); + } else { + $searched = ''; + $search_results = array(); + } + ?> +

    + + +

    - - - -

    + +
    -
    -
    -
      - + +
      +
      + +
      +
        +
      -
      -
    - -
    - +
    + +
    +
    + + +

    + + + + + + + +

    + +
    +
    name; + // paginate browsing for large numbers of objects + $per_page = 50; + $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1; + $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0; + $args = array( - 'child_of' => 0, 'orderby' => 'name', 'order' => 'ASC', - 'hide_empty' => false, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', - 'include' => '', 'number' => '', 'pad_counts' => false + 'child_of' => 0, + 'exclude' => '', + 'hide_empty' => false, + 'hierarchical' => 1, + 'include' => '', + 'include_last_update_time' => false, + 'number' => $per_page, + 'offset' => $offset, + 'order' => 'ASC', + 'orderby' => 'name', + 'pad_counts' => false, ); + $num_pages = ceil( wp_count_terms($taxonomy_name) / $per_page ); + + $page_links = paginate_links( array( + 'base' => add_query_arg( + array( + $taxonomy_name . '-tab' => 'all', + 'paged' => '%#%', + ) + ), + 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), + 'total' => $num_pages, + 'current' => $pagenum + )); + + $walker = new Walker_Nav_Menu_Checklist; // @todo transient caching of these results with proper invalidation on updating of a tax of this type - $terms = get_terms( $taxonomy['args']->name, $args ); + $terms = get_terms( $taxonomy_name, $args ); - if ( !$terms || is_wp_error($terms) ) + if ( ! $terms || is_wp_error($terms) ) $error = '
  • '. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'
    • '; - $term_names = ''; - if ( is_array($terms) ) { - foreach ( $terms as $term ) { - if ( $term->name ) { - $term_names .= htmlentities( $term->name ) .'|'; - } - } + $current_tab = 'most-used'; + if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) { + $current_tab = $_REQUEST[$taxonomy_name . '-tab']; } - $id = $taxonomy['args']->name; + if ( ! empty( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) { + $current_tab = 'search'; + } + + $removed_args = array( + 'action', + 'customlink-tab', + 'edit-menu-item', + 'menu-item', + 'page-tab', + '_wpnonce', + ); + ?> -

    - - -

    +
    + -

    - - - - +

    + +
    - - - -

    +
    + $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) ); + } else { + $searched = ''; + $search_results = array(); + } + ?> +

    + + +

    + + +
    -
    -
    -
      - +
      +
      + +
      +
        +
      -
      -
    - -
    - +
    + +
    +
    + +

    + + + + + + + +

    + +
    +
    post_parent) ) - $menu_item->post_parent = $menu_item->parent; + if ( is_nav_menu( $menu_id ) ) { - // Get all attachements and links - if ( in_array($object, array( 'attachment', 'custom' )) ) - $menu_item->post_parent = 0; + // Loop through all the menu items' POST values + foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) { + if ( + empty( $_item_object_data['menu-item-object-id'] ) && // checkbox is not checked + ( + ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set + in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default + 'custom' != $_item_object_data['menu-item-type'] || // or it's not a custom menu item + ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists + ) + ) { + continue; // then this potential menu item is not getting added to this menu + } - if ( 0 == $menu_item->post_parent ) { - // Set up the menu item - $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object ); + // if this possible menu item doesn't actually have a menu database ID yet + if ( + empty( $_item_object_data['menu-item-db-id'] ) || + ( 0 > $_possible_db_id ) || + $_possible_db_id != $_item_object_data['menu-item-db-id'] + ) { + $_actual_db_id = 0; + } else { + $_actual_db_id = (int) $_item_object_data['menu-item-db-id']; + } + + $args = array( + 'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ), + 'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ), + 'menu-item-object' => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ), + 'menu-item-parent-id' => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ), + 'menu-item-position' => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ), + 'menu-item-type' => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ), + 'menu-item-append' => ( isset( $_item_object_data['menu-item-append'] ) ? $_item_object_data['menu-item-append'] : '' ), + 'menu-item-title' => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ), + 'menu-item-url' => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ), + 'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ), + 'menu-item-attr-title' => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ), + 'menu-item-target' => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ), + 'menu-item-classes' => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ), + 'menu-item-xfn' => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ), + ); - // No blank titles - if ( empty($menu_item->title) ) - continue; + $items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args ); - $attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : ''; - - $output .= ''; - $output .= wp_get_nav_menu_item( $menu_item, $object_type, $object ); - $output .= wp_get_nav_menu_sub_items( $menu_item->ID, $object_type, $object, $context ); - $output .= ''; - - ++$i; } } - - return $output; + return $items_saved; } /** - * Recursive function to retrieve sub menu items. + * Returns the menu item formatted to edit. * * @since 3.0.0 * - * @param string $childof The Parent ID. - * @param string $object_type The object type. - * @param string $object The object name. - * @return string $output sub menu items. + * @param string $menu_item_id The ID of the menu item to format. + * @return string|WP_Error $output The menu formatted to edit or error object on failure. */ -function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $context = 'frontend' ) { - $args = array( 'child_of' => $childof, 'parent' => $childof, 'hide_empty' => false, ); +function wp_get_nav_menu_to_edit( $menu_item_id = 0 ) { + static $_placeholder; + + $menu = wp_get_nav_menu_object( $menu_item_id ); + + // If the menu exists, get its items. + if ( is_nav_menu( $menu ) ) { + $menu_items = wp_get_nav_menu_items( $menu->term_id ); - switch ( $object_type ) { - case 'post_type': - $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) ); - if ( in_array( $object, $hierarchical_post_types ) ) { - $args['post_type'] = $object; - $sub_menu_items = get_pages( $args ); - } else { - $sub_menu_items = array(); - } - break; + $walker = new Walker_Nav_Menu_Edit; - case 'taxonomy': - if ( is_taxonomy_hierarchical( $object ) ) { - $sub_menu_items = get_terms( $object, $args ); - } else { - $sub_menu_items = array(); - } - break; - - default: - $sub_menu_items = array(); - break; + return walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) ); + } elseif ( is_wp_error( $menu ) ) { + return $menu; } - $output = ''; - $i = 1; - if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) { - $output .= ''; - } - return $output; -} -?> \ No newline at end of file +?> Index: wp-admin/js/nav-menu.dev.js =================================================================== --- wp-admin/js/nav-menu.dev.js (revision 14247) +++ wp-admin/js/nav-menu.dev.js (working copy) @@ -8,494 +8,647 @@ * @subpackage Administration */ -var wpNavMenu; +var WPNavMenuHandler = function () { + var $ = jQuery, + activeHovering = false, + currentDropzone = null, + + customLinkNameInput, + customLinkURLInput, + customLinkNameDefault, + customLinkURLDefault, -(function($) { + autoCompleteData = {}, + + formatAutocompleteResponse = function( resultRow, pos, total, queryTerm ) { + if ( resultRow && resultRow[0] ) { + var data = $.parseJSON(resultRow[0]); + if ( data.post_title ) { + if ( data.ID && data.post_type ) + autoCompleteData[data.post_title] = {ID: data.ID, object_type: data.post_type}; + return data.post_title; + } + } + }, + + formatAutocompleteResult = function( resultRow, pos, total, queryTerm ) { + if ( resultRow && resultRow[0] ) { + var data = $.parseJSON(resultRow[0]); + if ( data.post_title ) + return data.post_title; + } + }, - wpNavMenu = { + getListDataFromID = function(menuItemID, parentEl) { + if ( ! menuItemID ) + return false; + parentEl = parentEl || document; + var fields = [ + 'menu-item-db-id', + 'menu-item-object-id', + 'menu-item-object', + 'menu-item-parent-id', + 'menu-item-position', + 'menu-item-type', + 'menu-item-append', + 'menu-item-title', + 'menu-item-url', + 'menu-item-description', + 'menu-item-attr-title', + 'menu-item-target', + 'menu-item-classes', + 'menu-item-xfn' + ], + itemData = {}, + inputs = parentEl.getElementsByTagName('input'), + i = inputs.length, + j, + menuID = document.getElementById('nav-menu-meta-object-id').value; + + while ( i-- ) { + j = fields.length; + while ( j-- ) { + if ( + inputs[i] && + inputs[i].name && + 'menu-item[' + menuItemID + '][' + fields[j] + ']' == inputs[i].name + ) { + itemData[fields[j]] = inputs[i].value; + } + } + } + + return itemData; + }, + + getParentMenuItemDBId = function() { + var allInputs = this.getElementsByTagName('input'), + i = allInputs.length, + j, + parentEl, + parentInputs; + + while( i-- ) { + if ( -1 != allInputs[i].name.indexOf('menu-item-parent-id[' + parseInt(this.id.replace('menu-item-', ''), 10) + ']') ) { + /* This LI element is not in a submenu */ + if ( ! this.parentNode.className || -1 == this.parentNode.className.indexOf('sub-menu') ) { + allInputs[i].value = 0; + + /* This LI is in a submenu, so need to get the parent's object ID (which is different from the parent's DB ID, the ID in its attributes) */ + } else if ( 'LI' == this.parentNode.parentNode.nodeName && -1 != this.parentNode.parentNode.id.indexOf('menu-item-') ) { + parentEl = this.parentNode.parentNode; + parentInputs = parentEl.getElementsByTagName('input'); + j = parentInputs.length; + while ( j-- ) { + if ( parentInputs[j].name && -1 != parentInputs[j].name.indexOf('menu-item-object-id[' + parseInt(parentEl.id.replace('menu-item-', ''), 10) + ']') ) { + allInputs[i].value = parseInt(parentInputs[j].value, 10); + break; + } + } + } + break; + } + } + }, + + makeDroppable = function(el) { + var that = this; + + $(el).droppable({ + accept: '.menu li', + tolerance: 'pointer', + drop: function(e, ui) { + that.eventOnDrop(ui.draggable[0], this, ui, e); + }, + + over: function(e,ui) { + that.eventOnDragOver(ui.draggable[0], this, ui, e); + }, + + out: function(e, ui) { + that.eventOnDragOut(ui.draggable[0], this, ui, e); + } + }); + }, + + menuList, + + setupListItemsDragAndDrop = function(list) { + if ( ! list ) + return; + + var menuListItems = list.getElementsByTagName('li'), + i = menuListItems.length; + while ( i-- ) + this.setupListItemDragAndDrop(menuListItems[i]); + }; + + return { + // Functions that run on init. init : function() { + menuList = document.getElementById('menu-to-edit'); - wpNavMenu.initial_meta_boxes(); + this.attachMenuEditListeners(); + + this.attachMenuMetaListeners(document.getElementById('nav-menu-meta')); - wpNavMenu.drag_and_drop(); + this.attachTabsPanelListeners(); - // Delete AYS - $('#update-nav-menu .deletion').click(function(){ - if ( confirm( navMenuL10n.warnDelete ) ) { - return true; - } else { - return false; - }; - }); + // init drag and drop + setupListItemsDragAndDrop.call(this, menuList); - // Handle Save Button Clicks - $('#update-nav-menu').submit(function(){ - wpNavMenu.update_post_data(); - }); - - // Handle some return keypresses - $('#create-menu-name').keypress(function(e){ - if ( 13 == e.keyCode ) { - $('#create-menu-button').click(); - return false; + postboxes.add_postbox_toggles('nav-menus'); + }, + + attachMenuEditListeners : function() { + var that = this; + $('#update-nav-menu').bind('click', function(e) { + if ( e.target && e.target.className ) { + if ( -1 != e.target.className.indexOf('item-edit') ) { + return that.eventOnClickEditLink(e.target); + } else if ( -1 != e.target.className.indexOf('menu-delete') ) { + return that.eventOnClickMenuDelete(e.target); + } else if ( -1 != e.target.className.indexOf('item-delete') ) { + return that.eventOnClickMenuItemDelete(e.target); + } } }); + }, - $('#custom-menu-item-url, #custom-menu-item-name').keypress(function(e){ - if ( 13 == e.keyCode ) { - $('#add-custom-links a.button').click(); - return false; - } - }).focus(function(){ - if ( $(this).val() == $(this).attr('defaultValue') && $(this).attr('id') != 'custom-menu-item-url' ) { - $(this).val(''); - } - }).blur(function(){ - if ( $(this).val() == '' ) { - $(this).val($(this).attr('defaultValue')); - } - }); + attachMenuMetaListeners : function(formEL) { + if ( ! formEL ) + return; - $('#create-menu-name').focus(function(){ - if ( $(this).val() == $(this).attr('defaultValue') ) { - $(this).val(''); - } - }).blur(function(){ - if ( $(this).val() == '' ) { - $(this).val($(this).attr('defaultValue')); - } - }); + var that = this; - // close postboxes that should be closed - $('.if-js-closed').removeClass('if-js-closed').addClass('closed'); + // set default value for custom link name + customLinkNameInput = document.getElementById('custom-menu-item-name'); + customLinkURLInput = document.getElementById('custom-menu-item-url'); - // postboxes setup - postboxes.add_postbox_toggles('nav-menus'); + if ( customLinkNameInput ) { + customLinkNameDefault = 'undefined' != typeof customLinkNameInput.defaultValue ? customLinkNameInput.defaultValue : customLinkNameInput.getAttribute('value'); + customLinkURLDefault = 'undefined' != typeof customLinkURLInput.defaultValue ? customLinkURLInput.defaultValue : customLinkURLInput.getAttribute('value'); + $(customLinkNameInput).bind('focus', function(e) { + this.value = customLinkNameDefault == this.value ? '' : this.value; + }); + + $(customLinkNameInput).bind('blur', function(e) { + this.value = '' == this.value ? customLinkNameDefault : this.value; + }); + } - // Clear the quick search textbox - $('.quick-search').click(function(){ - $(this).attr( 'value', '' ); + // auto-suggest for the quick-search boxes + $('input.quick-search').each(function(i, el) { + that.setupQuickSearchEventListeners(el); }); - - // Quick Search submit - $('.quick-search-submit').click(function(){ - $(this).siblings('.quick-search').search(); + + $(formEL).bind('submit', function(e) { + return that.eventSubmitMetaForm.call(that, this, e); }); + }, - // Edit menu item - $('#menu-container .item-edit').click(function(){ - wpNavMenu.edit_menu_item( $(this).attr('value') ); - }); + attachTabsPanelListeners : function() { + $('#menu-settings-column').bind('click', function(e) { + if ( e.target && e.target.className && -1 != e.target.className.indexOf('menu-tab-link') ) { + var i = e.target.parentNode, + activePanel, + panelIdMatch = /#(.*)$/.exec(e.target.href), + tabPanels; + while ( ! i.className || -1 == i.className.indexOf('inside') ) { + i = i.parentNode; + } + $('.tabs-panel', i).each(function() { + if ( this.className ) + this.className = this.className.replace('tabs-panel-active', 'tabs-panel-inactive'); + }); - // Delete menu item - $('#menu-container .item-delete').click(function(){ - wpNavMenu.remove_menu_item( $(this).attr('value') ); - }); + $('.tabs', i).each(function() { + this.className = this.className.replace('tabs', ''); + }); - // Update menu item settings (thickbox) - $('#update-menu-item').click(function(){ - wpNavMenu.update_menu_item(); - tb_remove(); - }); + e.target.parentNode.className += ' tabs'; - // Close thickbox - $('#cancel-save').click(function(){ - tb_remove(); + if ( panelIdMatch && panelIdMatch[1] ) { + activePanel = document.getElementById(panelIdMatch[1]); + if ( activePanel ) { + activePanel.className = activePanel.className.replace('tabs-panel-inactive', 'tabs-panel-active'); + } + } + + return false; + } else if ( e.target && e.target.className && -1 != e.target.className.indexOf('select-all') ) { + var selectAreaMatch = /#(.*)$/.exec(e.target.href); + if ( selectAreaMatch && selectAreaMatch[1] ) { + $('#' + selectAreaMatch[1] + ' .tabs-panel-active input[type=checkbox]').attr('checked', 'checked'); + return false; + } + } }); + }, - // Show All Button - $('.show-all').click(function(e){ - $(e.currentTarget).parent().parent().siblings('.list-wrap').css( 'display', 'block' ); - $(e.currentTarget).parent().parent().siblings('.list-wrap').find('li').css( 'display', 'block' ); - $(e.currentTarget).hide(); - $(e.currentTarget).siblings('.hide-all').show(); - }); + setupListItemDragAndDrop : function(el) { + var defLists = el.getElementsByTagName('dl'), + dropZone = this.makeListItemDropzone(el), + i = defLists.length; - // Hide All Button - $('.hide-all').click(function(e){ - $(e.currentTarget).parent().parent().siblings('.list-wrap').css( 'display', 'none' ); - $(e.currentTarget).parent().parent().siblings('.list-wrap').find('li').css( 'display', 'none' ); - $(e.currentTarget).hide(); - $(e.currentTarget).siblings('.show-all').show(); - }); + makeDroppable.call(this, dropZone); + this.makeListItemDraggable(el); - // Add menu items into the menu - $('.add-to-menu').click(function(e){ - wpNavMenu.add_checked_items_to_menu(e.currentTarget); - }); + while( i-- ) { + makeDroppable.call(this, defLists[i]); + } + }, - // Create a new link then add it to the menu - $('#add-custom-links .add-to-menu a').click(function(e){ - // Add link to menu - if ( $('#custom-menu-item-url').val() == $('#custom-menu-item-url').attr('defaultValue') ) - return; // Do not allow "http://" submissions to go through - - wpNavMenu.add_custom_link( $('#custom-menu-item-name').val(), $('#custom-menu-item-url').val() ); - - // Reset the fields back to their defaults - $('#custom-menu-item-name').val($('#custom-menu-item-name').attr('defaultValue')); - $('#custom-menu-item-url' ).val($('#custom-menu-item-url' ).attr('defaultValue')).focus(); + /** + * Set up quick-search input fields' events. + * + * @param object el The input element. + */ + setupQuickSearchEventListeners : function(el) { + var that = this; + $(el).autocomplete( ajaxurl + '?action=menu-quick-search&type=' + el.name, + { + delay: 500, + formatItem: formatAutocompleteResponse, + formatResult: formatAutocompleteResult, + minchars: 2, + multiple: false + } + ).bind('blur', function(e) { + var changedData = autoCompleteData[this.value], + inputEl = this; + if ( changedData ) { + $.post( + ajaxurl + '?action=menu-quick-search&type=get-post-item&response-format=markup', + changedData, + function(r) { + that.processQuickSearchQueryResponse.call(that, r, changedData); + autoCompleteData[inputEl.value] = false; + } + ); + } }); }, + + eventOnClickEditLink : function(clickedEl) { + var activeEdit, + matchedSection = /#(.*)$/.exec(clickedEl.href); + if ( matchedSection && matchedSection[1] ) { + activeEdit = document.getElementById(matchedSection[1]); + if ( activeEdit ) { + if ( -1 != activeEdit.className.indexOf('menu-item-edit-inactive') ) { + activeEdit.className = activeEdit.className.replace('menu-item-edit-inactive', 'menu-item-edit-active'); + } else { + activeEdit.className = activeEdit.className.replace('menu-item-edit-active', 'menu-item-edit-inactive'); + } + return false; + } + } + }, - add_custom_link : function( link_name, link_url ) { - var params = { - action: 'save-custom-link', - link_name: link_name, - link_url: link_url + eventOnClickMenuDelete : function(clickedEl) { + // Delete warning AYS + if ( confirm( navMenuL10n.warnDeleteMenu ) ) { + return true; + } else { + return false; } - - $.post( ajaxurl, params, function(link_id) { - if ( '-1' == link_id ) - return; + }, - wpNavMenu.add_to_menu( link_id, link_id, 'custom', 'custom', navMenuL10n.custom, 0, link_name, link_url, '', '', '', '', '' ); - }, 'json'); + eventOnClickMenuItemDelete : function(clickedEl) { + var itemID, + matchedSection, + that = this; + + // Delete warning AYS + if ( confirm( navMenuL10n.warnDeleteMenuItem ) ) { + matchedSection = /_wpnonce=([a-zA-Z0-9]*)$/.exec(clickedEl.href); + if ( matchedSection && matchedSection[1] ) { + itemID = parseInt(clickedEl.id.replace('delete-', ''), 10); + $.post( + ajaxurl, + { + action:'delete-menu-item', + 'menu-item':itemID, + '_wpnonce':matchedSection[1] + }, + function (resp) { + if ( '1' == resp ) + that.removeMenuItem(document.getElementById('menu-item-' + itemID)); + } + ); + return false; + } + return true; + } else { + return false; + } }, - + /** - * In combination with the php function wp_initial_nav_menu_meta_boxes(), - * this function limits the metaboxes for first time users to just links, pages and cats. + * Callback for the drag over action when dragging a list item. + * + * @param object draggedEl The DOM element being dragged + * @param object dropEl The DOM element on top of which we're dropping. */ - initial_meta_boxes : function() { - var hidden = $('#hidden-metaboxes').val().split( ',' ); + eventOnDragOver : function(draggedEl, dropEl) { + activeHovering = true; + currentDropzone = dropEl; + dropEl.className += ' sortable-placeholder'; + }, - if ( '' != hidden ) { - for ( var i = 0; i < hidden.length; i++ ) { - $( '#' + hidden[i] ).attr( 'style', 'display: none;' ); - $( '#' + hidden[i] + '-hide' ).attr( 'checked', false ); - }; - }; + /** + * Callback for the drag out action when dragging a list item. + * + * @param object draggedEl The DOM element being dragged + * @param object dropEl The DOM element on top of which we're dropping. + */ + eventOnDragOut : function(draggedEl, dropEl) { + activeHovering = false; + + /* delay the disappearance of the droppable area so it doesn't flicker in and out */ + (function(that) { + setTimeout(function() { + if ( that != currentDropzone || ( ! activeHovering && that.className && -1 != that.className.indexOf('sortable-placeholder') ) ) { + that.className = that.className.replace(/sortable-placeholder/g, ''); + } + }, 500); + })(dropEl); }, - - // Makes the menu items drag and droppable. - drag_and_drop : function() { - // Make sure all li's have dropzones - $('.menu li').each(function(){ - if ( !$(this).children('.dropzone').attr('class') ) { - $(this).prepend('
    '); - }; - }); - // make menu item draggable - $('.menu li').draggable({ - handle: ' > dl', - opacity: .8, - addClasses: false, - helper: 'clone', - zIndex: 100 - }); + /** + * Callback for the drop action when dragging and dropping a list item. + * + * @param object draggedEl The DOM element being dragged (and now dropped) + * @param object dropEl The DOM element on top of which we're dropping. + */ + eventOnDrop : function(draggedEl, dropEl) { + var dropIntoSublist = !! ( -1 == dropEl.className.indexOf('dropzone') ), + subLists = dropEl.parentNode.getElementsByTagName('ul'), + hasSublist = false, + i = subLists.length, + subList; - // make menu item droppable - $('.menu li dl, .menu li .dropzone').droppable({ - accept: '.menu li', - tolerance: 'pointer', - drop: function(e, ui) { - var li = $(this).parent(); - var child = !$(this).hasClass('dropzone'); + activeHovering = false; + + dropEl.className = dropEl.className.replace(/sortable-placeholder/g, ''); - var parent_id = li.children('input[name=menu-item-object-id[]]').val(); - var child_id = ui.draggable.children('input[name=menu-item-object-id[]]').val(); - - // An item cannot be a child of itself. Use a custom link for the effect. - if ( parent_id == child_id ) { - ui.draggable.find('dt').animate( { backgroundColor: '#FF3333' }, { duration: 'normal', complete: function() { $(this).css( 'backgroundColor', '' ) } } ); - $(this).parent().find('dt').removeAttr('style'); - return; - }; - - // Append UL to first child - if ( child && li.children('ul').length == 0 ) { - li.append( '