Changeset 29491

Timestamp:

08/14/2014 06:50:04 PM (10 years ago)

Author:

wonderboymusic

Message:

Media Grid, support MEDIA_TRASH:

• Only use the special trashAttachment logic when in edit-metadata mode.
• Don't support the trash filter in the Add Media modal for now.
• Properly toggle trash/untrash logic in the Attachment Details sidebar

See #29145.

Location:

trunk/src/wp-includes

Files:

• js/media-views.js (modified) (2 diffs)
• media-template.php (modified) (1 diff)

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

@@ -5719 +5719 @@
             };
 
-            if ( media.view.settings.mediaTrash ) {
+            if ( media.view.settings.mediaTrash
+                && this.controller.activeModes.where( { id: 'grid' } ).length ) {
                 filters.trash = {
                     text:  l10n.trash,
@@ -6500 +6501 @@
             event.preventDefault();
 
-            if ( media.view.settings.mediaTrash ) {
+            if ( media.view.settings.mediaTrash
+                && 'edit-metadata' === this.controller.content.mode() ) {
                 this.model.set( 'status', 'trash' );
                 this.model.save().done( function() {

trunk/src/wp-includes/media-template.php

@@ -509 +509 @@
                 <# if ( ! data.uploading && data.can.remove ) { #>
                     <?php if ( MEDIA_TRASH ): ?>
+                    <# if ( 'trash' === data.status ) { #>
+                        <a class="untrash-attachment" href="#"><?php _e( 'Untrash' ); ?></a>
+                    <# } else { #>
                         <a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
+                    <# } #>
                     <?php else: ?>
                         <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>