Ticket #58479: 58479-2.diff

src/js/_enqueues/admin/common.js

@@ -1114 +1114 @@
                 });
         }
 
-        $document.on( 'wp-updates-notice-added wp-plugin-install-error wp-plugin-update-error wp-plugin-delete-error wp-theme-install-error wp-theme-delete-error', makeNoticesDismissible );
+        $document.on( 'wp-updates-notice-added wp-plugin-install-error wp-plugin-update-error wp-plugin-delete-error wp-theme-install-error wp-theme-delete-error wp-notice-added', makeNoticesDismissible );
 
         // Init screen meta.
         screenMeta.init();
@@ -1276 +1276 @@
         // Marry the secondary "Change role to" controls to the primary controls:
         marryControls( $('#new_role'), $('#changeit'), $('#new_role2'), $('#changeit2') );
 
+        var addAdminNotice = function( data ) {
+                var $notice = $( data.selector ),
+                        $headerEnd = $( '.wp-header-end' ),
+                        $adminNotice;
+
+                delete data.selector;
+
+                $adminNotice = '<div id="' + data.id + '" class="notice notice-error is-dismissible"><p>' + data.message + '</p></div>';
+
+                // Check if this admin notice already exists.
+                if ( ! $notice.length ) {
+                        $notice = $( '#' + data.id );
+                }
+
+                if ( $notice.length ) {
+                        $notice.replaceWith( $adminNotice );
+                } else if ( $headerEnd.length ) {
+                        $headerEnd.after( $adminNotice );
+                } else {
+                        if ( 'customize' === pagenow ) {
+                                $( '.customize-themes-notifications' ).append( $adminNotice );
+                        } else {
+                                $( '.wrap' ).find( '> h1' ).after( $adminNotice );
+                        }
+                }
+
+                $document.trigger( 'wp-notice-added' );
+        };
+
+        $( '.bulkactions' ).parents('form').on( 'submit', function(event) {
+                var form = this;
+
+                var submiterName = event.originalEvent && event.originalEvent.submitter ? event.originalEvent.submitter.name : false;
+
+                var bulkFieldRelations = {
+                        'bulk_action': 'action',
+                        'changeit': 'new_role'
+                }
+
+                // We need to know which button was clicked and it's bulk_action button.
+                if( ! Object.keys(bulkFieldRelations).includes( submiterName ) ) {
+                        return;
+                }
+
+                var values = new FormData(form);
+                var value = values.get(bulkFieldRelations[submiterName]) || '-1';
+
+                // Check that the action is not the default one.
+                if( value !== '-1') {
+                        // Check that at least one item is selected.
+                        var itemsSelected = form.querySelectorAll('.wp-list-table tbody .check-column input[type="checkbox"]:checked');
+
+                        if ( itemsSelected.length > 0 ) {
+                                return;
+                        }
+                }
+
+                event.preventDefault();
+                event.stopPropagation();
+
+                $( 'html, body' ).animate( { scrollTop: 0 } );
+
+                var errorMessage = __( 'Please select at least one item to perform this action on.' );
+
+                addAdminNotice( {
+                        id:        'no-items-selected',
+                        className: 'notice-error is-dismissible',
+                        message:   errorMessage
+                } );
+
+                wp.a11y.speak( errorMessage );
+        });
+
         /**
          * Shows row actions on focus of its parent container element or any other elements contained within.
          *

src/js/_enqueues/wp/updates.js

@@ -2830 +2830 @@
                                         return;
                         }
 
-                        // Bail if there were no items selected.
-                        if ( ! itemsSelected.length ) {
-                                event.preventDefault();
-                                $( 'html, body' ).animate( { scrollTop: 0 } );
-
-                                return wp.updates.addAdminNotice( {
-                                        id:        'no-items-selected',
-                                        className: 'notice-error is-dismissible',
-                                        message:   __( 'Please select at least one item to perform this action on.' )
-                                } );
-                        }
-
                         // Determine the type of request we're dealing with.
                         switch ( bulkAction ) {
                                 case 'update-selected':

src/wp-admin/admin.php

@@ -113 +113 @@
 $date_format = __( 'F j, Y' );
 $time_format = __( 'g:i a' );
 
+wp_enqueue_script( 'wp-a11y' );
 wp_enqueue_script( 'common' );
 
 /**

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

@@ -625 +625 @@
 
                 echo "</select>\n";
 
-                submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+                submit_button( __( 'Apply' ), 'action', 'bulk_action', false, array( 'id' => "doaction$two" ) );
                 echo "\n";
         }