Ticket #18556: 18556.2.diff

wp-includes/js/admin-bar.js

@@ -70 +70 @@
                         interval: 100
                 });
 
+                adminbar.find('li.menupop').on({
+                        "draggable.start": function(e) {
+                                disableHoverIntent = true;
+                        },
+                        "draggable.stop": function(e) {
+                                disableHoverIntent = false;
+                        }
+                })
+
                 if ( window.location.hash )
                         window.scrollBy( 0, -32 );
 

wp-admin/js/widgets.js

@@ -80 +80 @@
                         zIndex: 100,
                         containment: 'document',
                         start: function(e,ui) {
+                                $('#wpadminbar li.menupop').trigger('draggable.start');
                                 ui.helper.find('div.widget-description').hide();
                                 the_id = this.id;
                         },
                         stop: function(e,ui) {
+                                $('#wpadminbar li.menupop').trigger('draggable.stop');
                                 if ( rem )
                                         $(rem).hide();
 
@@ -99 +101 @@
                         distance: 2,
                         containment: 'document',
                         start: function(e,ui) {
+                                $('#wpadminbar li.menupop').trigger('draggable.start');
                                 ui.item.children('.widget-inside').hide();
                                 ui.item.css({margin:'', 'width':''});
                         },
                         stop: function(e,ui) {
+                                $('#wpadminbar li.menupop').trigger('draggable.stop');
                                 if ( ui.item.hasClass('ui-draggable') && ui.item.data('draggable') )
                                         ui.item.draggable('destroy');
 

wp-admin/js/nav-menu.js

@@ -562 +562 @@
                                 handle: '.menu-item-handle',
                                 placeholder: 'sortable-placeholder',
                                 start: function(e, ui) {
+                                        $('#wpadminbar li.menupop').trigger('draggable.start');
                                         var height, width, parent, children, tempHolder;
 
                                         // handle placement for rtl orientation
@@ -612 +613 @@
                                         updateSharedVars(ui);
                                 },
                                 stop: function(e, ui) {
+                                        $('#wpadminbar li.menupop').trigger('draggable.stop');
                                         var children, depthChange = currentDepth - originalDepth;
 
                                         // Return child elements to the list

wp-admin/js/postbox.js

@@ -79 +79 @@
                                 forcePlaceholderSize: true,
                                 helper: 'clone',
                                 opacity: 0.65,
+                                start: function(e, ui) {
+                                        $('#wpadminbar li.menupop').trigger('draggable.start');
+                                },
                                 stop: function(e,ui) {
+                                        $('#wpadminbar li.menupop').trigger('draggable.stop');
                                         if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
                                                 $(this).sortable('cancel');
                                                 return;