Ticket #24716: 24716.27.diff

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

@@ -233 +233 @@
                  * Open the Edit Attachment modal.
                  */
                 editAttachment: function( model ) {
-                        var library = this.state().get('library'), hasPrevious, hasNext;
-                        if ( library.indexOf( model ) > 0 ) {
-                                hasPrevious = true;
-                        }
-                        else {
-                                hasPrevious = false;
-                        }
-                        if ( library.indexOf( model ) < library.length - 1 ) {
-                                hasNext = true;
-                        }
-                        else {
-                                hasNext = false;
-                        }
+                        var library = this.state().get('library');
 
-                        new media.view.Frame.EditAttachment({
-                                hasPrevious:    hasPrevious,
-                                hasNext:        hasNext,
-                                model:          model,
-                                gridController: this
+                        // Create a new EditAttachment frame, passing along the library and the attachment model.
+                        this.editAttachmentFrame = new media.view.Frame.EditAttachment({
+                                library:        library,
+                                model:          model
                         });
+
+                        // Listen to events on the edit attachment frame for triggering pagination callback handlers.
+                        this.listenTo( this.editAttachmentFrame, 'edit:attachment:next', this.editNextAttachment );
+                        this.listenTo( this.editAttachmentFrame, 'edit:attachment:previous', this.editPreviousAttachment );
                 },
 
                 /**
@@ -363 +354 @@
                                 this.on( 'router:render', this.browseRouter, this );
                         }
 
+                        this.options.hasPrevious = ( this.options.library.indexOf( this.options.model ) > 0 ) ? true : false;
+                        this.options.hasNext = ( this.options.library.indexOf( this.options.model ) < this.options.library.length - 1 ) ? true : false;
+
                         // Initialize modal container view.
                         if ( this.options.modal ) {
                                 this.modal = new media.view.Modal({
@@ -471 +465 @@
                         if ( ! this.options.hasPrevious )
                                 return;
                         this.modal.close();
-                        this.options.gridController.trigger( 'edit:attachment:previous', this.model );
+                        this.trigger( 'edit:attachment:previous', this.model );
                 },
 
                 /**
@@ -481 +475 @@
                         if ( ! this.options.hasNext )
                                 return;
                         this.modal.close();
-                        this.options.gridController.trigger( 'edit:attachment:next', this.model );
+                        this.trigger( 'edit:attachment:next', this.model );
                 }
-
         });
 
         media.view.GridFieldOptions = media.View.extend({