Changeset 39377 for branches/4.7

Timestamp:

11/30/2016 05:44:08 PM (8 years ago)

Author:

westonruter

Message:

Customize: Fix regression in ability to create submenus for nav menus via drag and drop.

See #34391.
Fixes #38948 for 4.7 branch.
Props delawski, adamsilverstein.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/js/customize-nav-menus.js (modified) (2 diffs)

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

@@ -1030 +1030 @@
 
         onChangeExpanded: function( expanded, args ) {
-            var section = this;
+            var section = this, completeCallback;
 
             if ( expanded ) {
@@ -1046 +1046 @@
                 } );
 
-                if ( 'resolved' !== section.deferred.initSortables.state() ) {
-                    wpNavMenu.initSortables(); // Depends on menu-to-edit ID being set above.
-                    section.deferred.initSortables.resolve( wpNavMenu.menuList ); // Now MenuControl can extend the sortable.
-
-                    // @todo Note that wp.customize.reflowPaneContents() is debounced, so this immediate change will show a slight flicker while priorities get updated.
-                    api.control( 'nav_menu[' + String( section.params.menu_id ) + ']' ).reflowMenuItems();
-                }
+                // Make sure Sortables is initialized after the section has been expanded to prevent `offset` issues.
+                if ( args.completeCallback ) {
+                    completeCallback = args.completeCallback;
+                }
+                args.completeCallback = function() {
+                    if ( 'resolved' !== section.deferred.initSortables.state() ) {
+                        wpNavMenu.initSortables(); // Depends on menu-to-edit ID being set above.
+                        section.deferred.initSortables.resolve( wpNavMenu.menuList ); // Now MenuControl can extend the sortable.
+
+                        // @todo Note that wp.customize.reflowPaneContents() is debounced, so this immediate change will show a slight flicker while priorities get updated.
+                        api.control( 'nav_menu[' + String( section.params.menu_id ) + ']' ).reflowMenuItems();
+                    }
+                    if ( _.isFunction( completeCallback ) ) {
+                        completeCallback();
+                    }
+                };
             }
             api.Section.prototype.onChangeExpanded.call( section, expanded, args );