Changeset 33323

Timestamp:

07/19/2015 12:05:26 AM (9 years ago)

Author:

westonruter

Message:

Customizer: Indicate when there are no nav menu items available for a given type.

Props celloexpressions, valendesigns, rittesh.patel.
Fixes #32810.

Location:

trunk/src

Files:

• wp-admin/css/customize-nav-menus.css (modified) (1 diff)
• wp-admin/js/customize-nav-menus.js (modified) (2 diffs)
• wp-includes/class-wp-customize-nav-menus.php (modified) (2 diffs)

trunk/src/wp-admin/css/customize-nav-menus.css

@@ -656 +656 @@
 }
 
+#available-menu-items .accordion-section-title .no-items,
+#available-menu-items .cannot-expand .accordion-section-title .spinner {
+    display: none;
+}
+
+#available-menu-items .cannot-expand .accordion-section-title .no-items {
+    display: block;
+    color: #777;
+    font-weight: normal;
+    float: right;
+    margin-left: 5px;
+}
+
 #available-menu-items .accordion-section-content {
     padding: 1px 15px 15px 15px;

trunk/src/wp-admin/js/customize-nav-menus.js

@@ -299 +299 @@
             itemTemplate = wp.template( 'available-menu-item' );
 
-            if ( 0 > self.pages[type] ) {
+            if ( 0 > self.pages[ type ] ) {
                 return;
             }
@@ -317 +317 @@
                 items = data.items;
                 if ( 0 === items.length ) {
+                    if ( 0 === self.pages[ type ] ) {
+                        $( '#available-menu-items-' + type )
+                            .addClass( 'cannot-expand' )
+                            .removeClass( 'loading' )
+                            .find( '.accordion-section-title > button' )
+                            .prop( 'tabIndex', -1 );
+                    }
                     self.pages[ type ] = -1;
                     return;

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -722 +722 @@
                     ?>
                     <div id="available-menu-items-<?php echo esc_attr( $type->name ); ?>" class="accordion-section">
-                        <h4 class="accordion-section-title"><?php echo esc_html( $type->label ); ?> <span class="spinner"></span> <button type="button" class="not-a-button"><span class="screen-reader-text"><?php _e( 'Toggle' ); ?></span></button></h4>
+                        <h4 class="accordion-section-title"><?php echo esc_html( $type->label ); ?> <span class="spinner"></span> <span class="no-items"><?php _e( 'No items' ); ?></span> <button type="button" class="not-a-button"><span class="screen-reader-text"><?php _e( 'Toggle' ); ?></span></button></h4>
                         <ul class="accordion-section-content" data-type="<?php echo esc_attr( $type->name ); ?>" data-obj_type="post_type"></ul>
                     </div>
@@ -734 +734 @@
                     ?>
                     <div id="available-menu-items-<?php echo esc_attr( $tax->name ); ?>" class="accordion-section">
-                        <h4 class="accordion-section-title"><?php echo esc_html( $tax->label ); ?> <span class="spinner"></span> <button type="button" class="not-a-button"><span class="screen-reader-text"><?php _e( 'Toggle' ); ?></span></button></h4>
+                        <h4 class="accordion-section-title"><?php echo esc_html( $tax->label ); ?> <span class="spinner"></span> <span class="no-items"><?php _e( 'No items' ); ?></span> <button type="button" class="not-a-button"><span class="screen-reader-text"><?php _e( 'Toggle' ); ?></span></button></h4>
                         <ul class="accordion-section-content" data-type="<?php echo esc_attr( $tax->name ); ?>" data-obj_type="taxonomy"></ul>
                     </div>