Ticket #35577: 35577.5.diff

src/wp-admin/css/nav-menus.css

@@ -693 +693 @@
 }
 
 .add-menu-item-pagelinks {
-        margin: .5em auto;
+        margin: .5em -10px;
         text-align: center;
 }
 
+.add-menu-item-pagelinks .page-numbers {
+        display: inline-block;
+        min-width: 20px;
+}
+
+.add-menu-item-pagelinks .page-numbers.dots {
+        min-width: 0;
+}
+
 .link-to-original {
         display: block;
         margin: 0 0 15px;

src/wp-admin/includes/nav-menu.php

@@ -358 +358 @@
                         )
                 ),
                 'format' => '',
-                'prev_text' => __('«'),
-                'next_text' => __('»'),
-                'total' => $num_pages,
+                'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
+                'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+                'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+                'total'   => $num_pages,
                 'current' => $pagenum
         ));
 
@@ -642 +643 @@
                         )
                 ),
                 'format' => '',
-                'prev_text' => __('&laquo;'),
-                'next_text' => __('&raquo;'),
-                'total' => $num_pages,
+                'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
+                'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+                'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+                'total'   => $num_pages,
                 'current' => $pagenum
         ));
 

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

@@ -1089 +1089 @@
                                         else if ( e.target.id && -1 != e.target.id.indexOf('submit-') )
                                                 $('#' + e.target.id.replace(/submit-/, '')).addSelectedToMenu( api.addMenuItemToBottom );
                                         return false;
-                                } else if ( target.hasClass('page-numbers') ) {
-                                        $.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox',
-                                                function( resp ) {
-                                                        if ( -1 == resp.indexOf('replace-id') )
-                                                                return;
+                                }
+                        });
 
-                                                        var metaBoxData = $.parseJSON(resp),
-                                                        toReplace = document.getElementById(metaBoxData['replace-id']),
-                                                        placeholder = document.createElement('div'),
-                                                        wrap = document.createElement('div');
+                        /*
+                         * Delegate the `click` event and attach it just to the pagination
+                         * links thus excluding the current page `<span>`. See ticket #35577.
+                         */
+                        $( '#nav-menu-meta' ).on( 'click', 'a.page-numbers', function() {
+                                var $container = $( this ).closest( '.inside' );
 
-                                                        if ( ! metaBoxData.markup || ! toReplace )
-                                                                return;
+                                $.post( ajaxurl, this.href.replace( /.*\?/, '' ).replace( /action=([^&]*)/, '' ) + '&action=menu-get-metabox',
+                                        function( resp ) {
+                                                var metaBoxData = $.parseJSON( resp ),
+                                                        toReplace;
 
-                                                        wrap.innerHTML = metaBoxData.markup ? metaBoxData.markup : '';
+                                                if ( -1 === resp.indexOf( 'replace-id' ) ) {
+                                                        return;
+                                                }
 
-                                                        toReplace.parentNode.insertBefore( placeholder, toReplace );
-                                                        placeholder.parentNode.removeChild( toReplace );
+                                                // Get the post type menu meta box to update.
+                                                toReplace = document.getElementById( metaBoxData['replace-id'] );
 
-                                                        placeholder.parentNode.insertBefore( wrap, placeholder );
+                                                if ( ! metaBoxData.markup || ! toReplace ) {
+                                                        return;
+                                                }
 
-                                                        placeholder.parentNode.removeChild( placeholder );
+                                                // Update the post type menu meta box with new content from the response.
+                                                $container.html( metaBoxData.markup );
+                                        }
+                                );
 
-                                                }
-                                        );
-
-                                        return false;
-                                }
+                                return false;
                         });
                 },