Changeset 29089

Timestamp:

07/11/2014 06:38:51 AM (12 years ago)

Author:

wonderboymusic

Message:

Media Grid:

• Don't store multiple references to the Edit Attachments frame.
• Fix keyboard navigation event delegation and proxy.
• Remove redundant function calls.

See #24716.

File:

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

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

@@ -238 +238 @@
                  */
                 editAttachment: function( model ) {
-                        var self    = this,
-                                library = this.state().get('library');
-
                         // Create a new EditAttachment frame, passing along the library and the attachment model.
-                        this.editAttachmentFrame = wp.media( {
+                        wp.media( {
                                 frame:       'edit-attachments',
                                 gridRouter:  this.gridRouter,
-                                library:     library,
+                                library:     this.state().get('library'),
                                 model:       model
-                        } );
-
-                        // Listen to keyboard events on the modal
-                        $( 'body' ).on( 'keydown.media-modal', function( e ) {
-                                self.editAttachmentFrame.keyEvent( e );
                         } );
                 },
@@ -461 +453 @@
                                 });
 
+                                this.modal.on( 'open', function () {
+                                        $( 'body' ).on( 'keydown.media-modal', _.bind( self.keyEvent, self ) );
+                                } );
+
                                 // Completely destroy the modal DOM element when closing it.
                                 this.modal.close = function() {
@@ -619 +615 @@
                         // The right arrow key
                         if ( event.keyCode === 39 ) {
-                                if ( ! this.hasNext() ) {
-                                        return;
-                                }
                                 this.nextMediaItem();
                         }
                         // The left arrow key
                         if ( event.keyCode === 37 ) {
-                                if ( ! this.hasPrevious() ) {
-                                        return;
-                                }
                                 this.previousMediaItem();
                         }