Ticket #29304: 29304-01.patch

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

@@ -5253 +5253 @@
                         this.collection.on( 'reset', this.render, this );
 
                         this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
-                        this.listenTo( this.controller, 'attachment:keydown:arrow', this.arrowEvent );
 
                         // Throttle the scroll handler and bind this.
                         this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
@@ -5281 +5280 @@
 
                 arrowEvent: function( event ) {
                         var attachments = this.$el.children( 'li' ),
-                                perRow = Math.round( this.$el.width() / attachments.first().outerWidth() ),
+                                perRow = this.$el.data( 'columns' ),
                                 index = attachments.filter( ':focus' ).index(),
                                 row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
 
+                        if ( index === -1 && this.options.selection.single() ) {
+                                index = this.collection.indexOf( this.options.selection.single() );
+                        }
+
                         // Left arrow
                         if ( 37 === event.keyCode ) {
                                 if ( 0 === index ) {
@@ -6001 +6004 @@
                                 AttachmentView: this.options.AttachmentView
                         });
 
+                        this.attachments.listenTo( this.controller, 'attachment:keydown:arrow', this.attachments.arrowEvent );
+
                         this.views.add( this.attachments );