Changeset 29582

Timestamp:

08/24/2014 04:17:01 PM (10 years ago)

Author:

helen

Message:

Media: Only fire keyboard events for the Attachments view once.

Firing them twice was breaking arrow key navigation in media attachment grids.

props gcorne.
fixes #29304.

File:

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

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

@@ -5254 +5254 @@
 
             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.
@@ -5282 +5281 @@
         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 ) {
+                return;
+            }
 
             // Left arrow
@@ -6001 +6004 @@
                 AttachmentView: this.options.AttachmentView
             });
+
+            // Add keydown listener to the instance of the Attachments view
+            this.attachments.listenTo( this.controller, 'attachment:keydown:arrow', this.attachments.arrowEvent );
 
             this.views.add( this.attachments );