Changeset 29299

Timestamp:

07/25/2014 12:59:29 AM (10 years ago)

Author:

wonderboymusic

Message:

Media Grid: when closing the modal, automatically focus the proper attachment by reading the model's ID, which is unique.

Props adamsilverstein (for the red), wonderboymusic (for the green).
Fixes #28857.

Location:

trunk/src/wp-includes/js

Files:

• media-grid.js (modified) (3 diffs)
• media-views.js (modified) (1 diff)

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

@@ -176 +176 @@
                 frame:       'edit-attachments',
                 gridRouter:  this.gridRouter,
-                gridItem:    $( currentTarget ).closest( 'li' ),
                 library:     this.state().get('library'),
                 model:       model
@@ -369 +368 @@
             });
 
-            this.gridItem = this.options.gridItem;
             this.gridRouter = this.options.gridRouter;
             this.library = this.options.library;
@@ -407 +405 @@
                     $( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
                     // Restore the original focus item if possible
-                    self.gridItem && self.gridItem.focus();
+                    $( 'li.attachment[data-id="' + self.model.get( 'id' ) +'"]' ).focus();
                     self.resetRoute();
                 } );

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

@@ -4640 +4640 @@
                     rerenderOnModelChange: true
                 } );
-            this.$el.attr( 'aria-label', this.model.get( 'title' ) ).attr( 'aria-checked', false );
+            this.$el.attr( {
+                'aria-label'  : this.model.get( 'title' ),
+                'aria-checked': false,
+                'data-id'     : this.model.get( 'id' )
+            } );
 
             if ( options.rerenderOnModelChange ) {