Changeset 32948 for trunk/src/wp-admin/includes/class-wp-list-table.php

Timestamp:

06/25/2015 08:31:51 PM (11 years ago)

Author:

wonderboymusic

Message:

List tables: when post navigation links point to the current page, use <span>s and text instead of <a>s.

Props afercia.
Fixes #32253.

File:

• trunk/src/wp-admin/includes/class-wp-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -705 +705 @@
                 $total_pages_after  = '</span>';
 
-                $disable_first = $disable_last = '';
-                if ( $current == 1 ) {
-                        $disable_first = ' disabled';
-                }
-                if ( $current == $total_pages ) {
-                        $disable_last = ' disabled';
-                }
-                $page_links[] = sprintf( "<a class='%s' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-                        'first-page' . $disable_first,
-                        esc_url( remove_query_arg( 'paged', $current_url ) ),
-                        __( 'First page' ),
-                        '&laquo;'
-                );
-
-                $page_links[] = sprintf( "<a class='%s' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-                        'prev-page' . $disable_first,
-                        esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
-                        __( 'Previous page' ),
-                        '&lsaquo;'
-                );
+                $disable_first = $disable_last = $disable_prev = $disable_next = false;
+
+                if ( $current == 1 ) {
+                        $disable_first = true;
+                        $disable_prev = true;
+                }
+                if ( $current == 2 ) {
+                        $disable_first = true;
+                }
+                if ( $current == $total_pages ) {
+                        $disable_last = true;
+                        $disable_next = true;
+                }
+                if ( $current == $total_pages - 1 ) {
+                        $disable_last = true;
+                }
+
+                if ( $disable_first ) {
+                        $page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&laquo;</span>';
+                } else {
+                        $page_links[] = sprintf( "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+                                esc_url( remove_query_arg( 'paged', $current_url ) ),
+                                __( 'First page' ),
+                                '&laquo;'
+                        );
+                }
+
+                if ( $disable_prev ) {
+                        $page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
+                } else {
+                        $page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+                                esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
+                                __( 'Previous page' ),
+                                '&lsaquo;'
+                        );
+                }
 
                 if ( 'bottom' == $which ) {
                         $html_current_page  = $current;
-                        $total_pages_before = '<span id="table-paging" class="paging-input">';
+                        $total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input">';
                 } else {
                         $html_current_page = sprintf( "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' />",
@@ -739 +755 @@
                 $page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
 
-                $page_links[] = sprintf( "<a class='%s' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-                        'next-page' . $disable_last,
-                        esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
-                        __( 'Next page' ),
-                        '&rsaquo;'
-                );
-
-                $page_links[] = sprintf( "<a class='%s' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-                        'last-page' . $disable_last,
-                        esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
-                        __( 'Last page' ),
-                        '&raquo;'
-                );
+                if ( $disable_next ) {
+                        $page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
+                } else {
+                        $page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+                                esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
+                                __( 'Next page' ),
+                                '&rsaquo;'
+                        );
+                }
+
+                if ( $disable_last ) {
+                        $page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&raquo;</span>';
+                } else {
+                        $page_links[] = sprintf( "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+                                esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
+                                __( 'Last page' ),
+                                '&raquo;'
+                        );
+                }
 
                 $pagination_links_class = 'pagination-links';