Changeset 14267

Timestamp:

04/28/2010 04:09:00 AM (15 years ago)

Author:

nacin

Message:

Some menus meta box cleanups. props filosofo, see #13143.

Location:

trunk/wp-admin

Files:

• css/nav-menu.dev.css (modified) (1 diff)
• includes/nav-menu.php (modified) (5 diffs)
• js/nav-menu.dev.js (modified) (9 diffs)

trunk/wp-admin/css/nav-menu.dev.css

@@ -88 +88 @@
 }
 
-form.processing .add-to-menu {
+.processing .add-to-menu {
     background: url("../images/wpspin_light.gif") no-repeat top center;
     display:block;

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

@@ -261 +261 @@
  **/
 function wp_nav_menu_meta_boxes_setup() {
-    add_meta_box( 'add-custom-links', __('Add Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+    add_meta_box( 'add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
     wp_nav_menu_post_type_meta_boxes();
     wp_nav_menu_taxonomy_meta_boxes();
@@ -311 +311 @@
     foreach ( $post_types as $post_type ) {
         $id = $post_type->name;
-        add_meta_box( "add-{$id}", sprintf( __('Add %s'), $post_type->label ), 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', 'default', $post_type );
+        add_meta_box( "add-{$id}", $post_type->label, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', 'default', $post_type );
     }
 }
@@ -328 +328 @@
     foreach ( $taxonomies as $tax ) {
         $id = $tax->name;
-        add_meta_box( "add-{$id}", sprintf( __('Add %s'), $tax->label ), 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+        add_meta_box( "add-{$id}", $tax->label, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
     }
 }
@@ -487 +487 @@
         $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>';
 
-    $current_tab = 'search';
+    $current_tab = 'all';
     if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) {
         $current_tab = $_REQUEST[$post_type_name . '-tab'];
@@ -508 +508 @@
     <div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
         <ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
+            <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)); ?>#<?php echo $post_type_name; ?>-all"><?php _e('View All'); ?></a></li>
             <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search"><?php _e('Search'); ?></a></li>
-            <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)); ?>#<?php echo $post_type_name; ?>-all"><?php _e('View All'); ?></a></li>
         </ul>
 

trunk/wp-admin/js/nav-menu.dev.js

@@ -112 +112 @@
     },
 
+    /**
+     * Get the parent element with the matching class, but go no higher than the form.
+     *
+     * @param DOM-element el The descendant element up from which we'll be searching
+     * @param string parentClass The class name of the desired parent element.
+     * @return DOM-element The parent element.
+     */
+    getParentWrapper = function( el, parentClass ) {
+        var form = document.getElementById('nav-menu-meta'),
+        i;
+
+        while ( 
+            el.parentNode &&
+            ( ! el.className || -1 == el.className.indexOf(parentClass) ) &&
+            el.parentNode != form
+        ) {
+            el = el.parentNode;
+        }
+
+        return el;
+    },
+
     makeDroppable = function(el) {
         var that = this;
@@ -427 +449 @@
          */
         eventSubmitMetaForm : function(thisForm, e) {
-            var inputs = thisForm.getElementsByTagName('input'),
+            var ancestor,
+            inputs = thisForm.getElementsByTagName('input'),
             i = inputs.length,
             j,
@@ -437 +460 @@
             re = new RegExp('menu-item\\[(\[^\\]\]*)');
 
-            thisForm.className = thisForm.className + ' processing',
             that = this;
 
@@ -465 +487 @@
                     }
 
+                    ancestor = getParentWrapper(inputs[i], 'inside');
                     inputs[i].checked = false;
 
@@ -474 +497 @@
                     -1 != inputs[i].className.search(/quick-search\b[^-]/)
                 ) {
+                    ancestor = getParentWrapper(inputs[i], 'inside');
                     params['action'] = 'menu-quick-search';
                     params['q'] = inputs[i].value;
@@ -481 +505 @@
                 }
             }
+
+            if ( ancestor )
+                ancestor.className = ancestor.className + ' processing',
+
             params['menu'] = thisForm.elements['menu'].value;
             params['menu-settings-column-nonce'] = thisForm.elements['menu-settings-column-nonce'].value;
@@ -486 +514 @@
             $.post( ajaxurl, params, function(menuMarkup) {
                 processMethod.call(that, menuMarkup, params);   
-                thisForm.className = thisForm.className.replace(/processing/g, '');
+                ancestor.className = ancestor.className.replace(/processing/g, '');
             });
 
@@ -593 +621 @@
                 resultList = document.getElementById(req.object_type + '-search-checklist');
                 if ( resultList ) {
+                    resultList.innerHTML = '';
                     resultList.appendChild(items[0]);
                 }
@@ -600 +629 @@
                     resultList = document.getElementById(matched[1] + '-search-checklist');
                     if ( resultList ) {
+                        resultList.innerHTML = '';
                         i = items.length;
                         while( i-- ) {