Changeset 29585

Timestamp:

08/24/2014 04:54:35 PM (12 years ago)

Author:

wonderboymusic

Message:

Media Grid: Don't make checkboxes tabbable when in bulk select media grid mode, fixes tabbing in bulk select mode.

Props adamsilverstein.
See #28822.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (2 diffs)

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

@@ -4943 +4943 @@
          */
         select: function( model, collection ) {
-            var selection = this.options.selection;
+            var selection = this.options.selection,
+                controller = this.controller;
 
             // Check if a selection exists and if it's the collection provided.
@@ -4957 +4958 @@
             }
 
-            // Add 'selected' class to model, set aria-checked to true and make the checkbox tabable.
-            this.$el.addClass( 'selected' ).attr( 'aria-checked', true )
-                .find( '.check' ).attr( 'tabindex', '0' );
+            // Add 'selected' class to model, set aria-checked to true.
+            this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
+            //  Make the checkbox tabable, except in media grid (bulk select mode).
+            if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
+                this.$( '.check' ).attr( 'tabindex', '0' );
+            }
         },
         /**