Ticket #23560: 23560.18.diff

src/wp-includes/js/media-views.js

@@ -4628 +4628 @@
                         'click .close':                   'removeFromLibrary',
                         'click .check':                   'checkClickHandler',
                         'click a':                        'preventDefault',
-                        'keydown':                        'toggleSelectionHandler'
+                        'keydown':                        'keydownHandler'
                 },
 
                 buttons: {},
@@ -4741 +4741 @@
                                 this.$bar.width( this.model.get('percent') + '%' );
                         }
                 },
-                /**
-                 * @param {Object} event
-                 */
-                toggleSelectionHandler: function( event ) {
-                        var method;
-
-                        // Catch arrow events
+                keydownHandler: function( event ) {
+                        var keyCode = event.which;
+                        // Catch arrow events.
                         if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
                                 this.arrowEvent(event);
                                 return;
                         }
-
-                        // Catch enter and space events
-                        if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+                        // Catch enter and space key presses.
+                        if ( 'keydown' === event.type && ( 13 === event.keyCode || 32 === event.keyCode ) ) {
+                                this.toggleSelectionHandler( event );
                                 return;
                         }
+                },
+                /**
+                 * @param {Object} event
+                 */
+                toggleSelectionHandler: function( event ) {
+                        var method;
 
                         // In the grid view, bubble up an edit:attachment event to the controller.
-                        if ( this.controller.isModeActive( 'grid' ) ) {
+                        if ( this.controller.isModeActive( 'grid' ) && ! $(event.target).hasClass( 'check' ) ) {
                                 this.controller.trigger( 'edit:attachment', this.model );
                                 return;
                         }