Ticket #32810: 32810.3.diff

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

@@ -294 +294 @@
 
                 // Load available menu items.
                 loadItems: function( type, obj_type ) {
-                        var self = this, params, request, itemTemplate;
+                        var self = this, params, request, itemTemplate, typeInner;
                         itemTemplate = wp.template( 'available-menu-item' );
-
+                        typeInner = $( '#available-menu-items-' + type + ' .accordion-section-content' );
+                        
                         if ( 0 > self.pages[type] ) {
                                 return;
                         }
@@ -312 +313 @@
                         request = wp.ajax.post( 'load-available-menu-items-customizer', params );
 
                         request.done(function( data ) {
-                                var items, typeInner;
+                                var items;
                                 items = data.items;
                                 if ( 0 === items.length ) {
                                         self.pages[ type ] = -1;
@@ -319 +320 @@
                                         return;
                                 }
                                 items = new api.Menus.AvailableItemCollection( items ); // @todo Why is this collection created and then thrown away?
-                                self.collection.add( items.models );
-                                typeInner = $( '#available-menu-items-' + type + ' .accordion-section-content' );
+                                self.collection.add( items.models );                            
                                 items.each(function( menu_item ) {
                                         typeInner.append( itemTemplate( menu_item.attributes ) );
                                 });
@@ -327 +327 @@
                                 self.pages[ type ] = self.pages[ type ] + 1;
                         });
                         request.fail(function( data ) {
-                                if ( typeof console !== 'undefined' && console.error ) {
-                                        console.error( data );
+                                if ( data.message !== 'undefined' ) {
+                                        typeInner.empty().append( $( '<p class="nothing-found"></p>' ).text( data.message ) );
                                 }
                         });
                         request.always(function() {

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

@@ -152 +152 @@
                         }
                 }
 
-                wp_send_json_success( array( 'items' => $items ) );
+                if ( empty( $items ) ) {
+                        wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
+                } else {
+                        wp_send_json_success( array( 'items' => $items ) );
+                }
         }
 
         /**