Ticket #18556: 18556.4.diff

wp-admin/js/nav-menu.js

@@ -429 +429 @@
                                         totalMenuItems = $('#menu-to-edit li').length,
                                         hasSameDepthSibling = menuItem.nextAll( '.menu-item-depth-' + depth ).length;
 
-                                menuItem.find( '.field-move' ).toggle( totalMenuItems > 1 ); 
+                                menuItem.find( '.field-move' ).toggle( totalMenuItems > 1 );
 
                                 // Where can they move this menu item?
                                 if ( 0 !== position ) {
@@ -592 +592 @@
                                 handle: '.menu-item-handle',
                                 placeholder: 'sortable-placeholder',
                                 start: function(e, ui) {
+                                        // Disable dropdown of adminbar
+                                        $('#wpadminbar .menupop').addClass('disable');
+
                                         var height, width, parent, children, tempHolder;
 
                                         // handle placement for rtl orientation
@@ -642 +645 @@
                                         updateSharedVars(ui);
                                 },
                                 stop: function(e, ui) {
+                                        // Reactivate dropdown of adminbar
+                                        $('#wpadminbar .menupop').removeClass('disable');
+
                                         var children, subMenuTitle,
                                                 depthChange = currentDepth - originalDepth;
 

wp-admin/js/postbox.js

@@ -87 +87 @@
                                 forcePlaceholderSize: true,
                                 helper: 'clone',
                                 opacity: 0.65,
+                                start: function() {
+                                        // Disable dropdown of adminbar
+                                        $('#wpadminbar .menupop').addClass('disable');
+                                },
                                 stop: function() {
+                                        // Reactivate dropdown of adminbar
+                                        $('#wpadminbar .menupop').removeClass('disable');
+
                                         if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
                                                 $(this).sortable('cancel');
                                                 return;

wp-admin/js/widgets.js

@@ -91 +91 @@
                         zIndex: 100,
                         containment: 'document',
                         start: function( event, ui ) {
+                                // Disable dropdown of adminbar
+                                $('#wpadminbar .menupop').addClass('disable');
+
                                 var chooser = $(this).find('.widgets-chooser');
 
                                 ui.helper.find('div.widget-description').hide();
@@ -105 +108 @@
                                 }
                         },
                         stop: function() {
+                                // Reactivate dropdown of adminbar
+                                $('#wpadminbar .menupop').removeClass('disable');
+
                                 if ( rem ) {
                                         $(rem).hide();
                                 }
@@ -121 +127 @@
                         distance: 2,
                         containment: 'document',
                         start: function( event, ui ) {
+                                // Disable dropdown of adminbar
+                                $('#wpadminbar .menupop').addClass('disable');
+
                                 var height, $this = $(this),
                                         $wrap = $this.parent(),
                                         inside = ui.item.children('.widget-inside');
@@ -139 +148 @@
                         },
 
                         stop: function( event, ui ) {
+                                // Reactivate dropdown of adminbar
+                                $('#wpadminbar .menupop').removeClass('disable');
+
                                 var addNew, widgetNumber, $sidebar, $children, child, item,
                                         $widget = ui.item,
                                         id = the_id;

wp-includes/css/admin-bar.css

@@ -161 +161 @@
         padding: 6px 0;
 }
 
+#wpadminbar .disable .ab-submenu {
+        display:none !important;
+}
+
 #wpadminbar .selected .shortlink-input {
         display: block;
 }