Ticket #13524: 13524.7.patch

src/wp-admin/js/widgets.js

@@ -94 +94 @@
                         helper: 'clone',
                         zIndex: 100,
                         containment: '#wpwrap',
+                        refreshPositions: true,
                         start: function( event, ui ) {
                                 var chooser = $(this).find('.widgets-chooser');
 
@@ -117 +118 @@
                         }
                 });
 
+                var $hoveredSidebar = false;
+
+                function closeWidgetWrap( widget ) {
+                        var $widget = $( widget.target );
+                        $hoveredSidebar.addClass( 'closed' );
+                        $widget.css( 'min-height', '' );
+                        $hoveredSidebar = false;
+                }
+
+                sidebars.droppable( {
+                        tolerance: 'intersect',
+                        over     : function( e, ui ) {
+                                var $widget = $( e.target ),
+                                        $wrap = $widget.parent();
+
+                                if ( $hoveredSidebar && ! $wrap.is( $hoveredSidebar ) ) {
+                                        closeWidgetWrap( e );
+                                }
+
+                                if ( $wrap.hasClass( 'closed' ) ) {
+                                        $hoveredSidebar = $wrap;
+                                        $wrap.removeClass( 'closed' );
+                                }
+                        },
+
+                        out: function( e, ui ) {
+                                if ( $hoveredSidebar ) {
+                                        closeWidgetWrap( e );
+                                }
+                        },
+                } );
+
                 sidebars.sortable({
                         placeholder: 'widget-placeholder',
                         items: '> .widget',
@@ -147 +180 @@
                                 var addNew, widgetNumber, $sidebar, $children, child, item,
                                         $widget = ui.item,
                                         id = the_id;
+
+                                // Reset the var to hold a previously closed sidebar
+                                $hoveredSidebar = false;
 
                                 if ( $widget.hasClass('deleting') ) {
                                         wpWidgets.save( $widget, 1, 0, 1 ); // delete widget