Ticket #25112: 25112.1.diff

src/wp-admin/js/nav-menu.js

@@ -59 +59 @@
                         // jQuery extensions
                         $.fn.extend({
                                 menuItemDepth : function() {
-                                        var margin = api.isRTL ? this.eq(0).css('margin-right') : this.eq(0).css('margin-left');
-                                        return api.pxToDepth( margin && -1 != margin.indexOf('px') ? margin.slice(0, -2) : 0 );
+                                        if ( this.hasClass( 'menu-item-depth-0' ) )
+                                                return 0;
+                                        else if ( this.hasClass( 'menu-item-depth-1' ) )
+                                                return 1;
+                                        else if ( this.hasClass( 'menu-item-depth-2' ) )
+                                                return 2;
+                                        else if ( this.hasClass( 'menu-item-depth-3' ) )
+                                                return 3;
+                                        else if ( this.hasClass( 'menu-item-depth-4' ) )
+                                                return 4;
+                                        else if ( this.hasClass( 'menu-item-depth-5' ) )
+                                                return 5;
+                                        else if ( this.hasClass( 'menu-item-depth-6' ) )
+                                                return 6;
+                                        else if ( this.hasClass( 'menu-item-depth-7' ) )
+                                                return 7;
+                                        else if ( this.hasClass( 'menu-item-depth-8' ) )
+                                                return 8;
+                                        else if ( this.hasClass( 'menu-item-depth-9' ) )
+                                                return 9;
+                                        else if ( this.hasClass( 'menu-item-depth-10' ) )
+                                                return 10;
+                                        else if ( this.hasClass( 'menu-item-depth-11' ) )
+                                                return 11;
+                                        return 0;
                                 },
                                 updateDepthClass : function(current, prev) {
                                         return this.each(function(){
@@ -408 +431 @@
                                 var $this = $(this),
                                         movement = [],
                                         availableMovement = '',
-                                        menuItem = $this.parents( 'li.menu-item' ).first(),
+                                        menuItem = $this.closest( 'li.menu-item' ).first(),
                                         depth = menuItem.menuItemDepth(),
                                         isPrimaryMenuItem = ( 0 === depth ),
-                                        itemName = $this.parents( '.menu-item-handle' ).find( '.menu-item-title' ).text(),
+                                        itemName = $this.closest( '.menu-item-handle' ).find( '.menu-item-title' ).text(),
                                         position = parseInt( menuItem.index() ),
                                         prevItemDepth = ( isPrimaryMenuItem ) ? depth : parseInt( depth - 1 ),
                                         prevItemNameLeft = menuItem.prevAll('.menu-item-depth-' + prevItemDepth).first().find( '.menu-item-title' ).text(),
@@ -455 +478 @@
                                 }
 
                                 if ( isPrimaryMenuItem ) {
-                                        var primaryItems = $( '.menu-item-depth-0' ),
+                                        var primaryItems = $( '#menu-to-edit' ).children( '.menu-item-depth-0' ),
                                                 itemPosition = primaryItems.index( menuItem ) + 1,
                                                 totalMenuItems = primaryItems.length,