Changeset 29098

Timestamp:

07/11/2014 06:49:12 PM (10 years ago)

Author:

wonderboymusic

Message:

Media Grid: after [29085], also handle MEDIA_TRASH.

See #24716.

File:

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

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

@@ -310 +310 @@
         },
 
-        deleteAttachment: function( event ) {
+        preDestroy: function( event ) {
             event.preventDefault();
 
             this.lastIndex = this.controller.getCurrentIndex();
             this.hasNext = this.controller.hasNext();
-
+        },
+
+        trashAttachment: function( event ) {
+            this.preDestroy( event );
+            media.view.Attachment.Details.prototype.trashAttachment.apply( this, arguments );
+        },
+
+        deleteAttachment: function( event ) {
+            this.preDestroy( event );
             media.view.Attachment.Details.prototype.deleteAttachment.apply( this, arguments );
         },
@@ -503 +511 @@
             this.content.set( view );
             // Update browser url when navigating media details
-            this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );
+            if ( this.model ) {
+                this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );
+            } else {
+                this.resetRoute();
+            }
         },