Ticket #36916: media-grid.js.patch

media-grid.js

@@ -118 +118 @@
         toggleSelectionHandler: function() {},
 
         render: function() {
-                Details.prototype.render.apply( this, arguments );
+                var that = this;
+                wp.media.view.Attachment.Details.prototype.render.apply( this, arguments );
+                this.players = this.players || [];
 
-                wp.media.mixin.removeAllPlayers();
-                this.$( 'audio, video' ).each( function (i, elem) {
+                wp.media.mixin.unsetPlayers.call( this );
+
+                this.$( 'audio, video' ).each( function ( i, elem ) {
                         var el = wp.media.view.MediaDetails.prepareSrc( elem );
-                        new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
+                        that.players.push( new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings ) );
                 } );
         }
 });
@@ -382 +385 @@
                 });
 
                 this.controller = this.options.controller;
-                this.gridRouter = this.controller.gridRouter;
                 this.library = this.options.library;
 
                 if ( this.options.model ) {
@@ -428 +430 @@
                                 $( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
                                 // Restore the original focus item if possible
                                 $( 'li.attachment[data-id="' + this.model.get( 'id' ) +'"]' ).focus();
-                                this.resetRoute();
                         }, this ) );
 
                         // Set this frame as the modal's content.
@@ -466 +467 @@
                         controller: this,
                         model:      this.model
                 }) );
-
-                // Update browser url when navigating media details
-                if ( this.model ) {
-                        this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );
-                }
         },
 
         /**
@@ -573 +569 @@
                 if ( 37 === event.keyCode ) {
                         this.previousMediaItem();
                 }
-        },
-
-        resetRoute: function() {
-                this.gridRouter.navigate( this.gridRouter.baseUrl( '' ) );
         }
 });
 
@@ -780 +772 @@
          * Open the Edit Attachment modal.
          */
         openEditAttachmentModal: function( model ) {
-                // Create a new EditAttachment frame, passing along the library and the attachment model.
-                wp.media( {
+                this._frame = wp.media( {
                         frame:       'edit-attachments',
                         controller:  this,
                         library:     this.state().get('library'),
                         model:       model
                 } );
+
+                this._frame.modal.on( 'close', this.resetRoute, this );
+                this._frame.on( 'content:create:edit-metadata', this.setRoute, this );
         },
 
         /**
@@ -845 +839 @@
                                 pushState: true
                         } );
                 }
+        },
+
+        resetRoute: function() {
+                this.gridRouter.navigate( this.gridRouter.baseUrl( '' ) );
+        },
+
+        setRoute: function() {
+                // Update browser url when navigating media details
+                if ( this._frame.model ) {
+                        this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this._frame.model.id ) );
+                }
         }
 });