Ticket #30690: 30690.2.diff

src/wp-admin/js/customize-widgets.js

@@ -621 +621 @@
                          * Update available sidebars when their rendered state changes
                          */
                         updateAvailableSidebars = function() {
-                                var $sidebarItems = $moveWidgetArea.find( 'li' ), selfSidebarItem;
+                                var $sidebarItems = $moveWidgetArea.find( 'li' ), selfSidebarItem,
+                                        renderedSidebars = 0;
 
                                 selfSidebarItem = $sidebarItems.filter( function(){
                                         return $( this ).data( 'id' ) === self.params.sidebar_id;
@@ -629 +630 @@
 
                                 $sidebarItems.each( function() {
                                         var li = $( this ),
-                                                sidebarId,
-                                                sidebar;
+                                                sidebarId, sidebar, isRendered;
 
                                         sidebarId = li.data( 'id' );
                                         sidebar = api.Widgets.registeredSidebars.get( sidebarId );
+                                        isRendered = sidebar.get( 'is_rendered' );
 
-                                        li.toggle( sidebar.get( 'is_rendered' ) );
+                                        li.toggle( isRendered );
 
-                                        if ( li.hasClass( 'selected' ) && ! sidebar.get( 'is_rendered' ) ) {
+                                        if ( isRendered ) {
+                                                renderedSidebars++;
+                                        }
+
+                                        if ( li.hasClass( 'selected' ) && ! isRendered ) {
                                                 selectSidebarItem( selfSidebarItem );
                                         }
                                 } );
 
-                                if ( 1 === $sidebarItems.length ) {
+                                if ( renderedSidebars > 1 ) {
+                                        self.container.find( '.move-widget' ).show();
+                                } else {
                                         self.container.find( '.move-widget' ).hide();
-                                } else {
-                                        self.container.find( '.move-widget' ).show();
                                 }
                         };