Changeset 27454

Timestamp:

03/07/2014 04:41:49 PM (11 years ago)

Author:

wonderboymusic

Message:

When MEDIA_TRASH is true, show the proper context in the attachment-details sidebar. Without this fix, it always showed "Delete Permanently."

Props toszcze.
Fixes #26783.

Location:

trunk/src/wp-includes

Files:

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

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

@@ -1389 +1389 @@
 .attachment-info .edit-attachment,
 .attachment-info .refresh-attachment,
-.attachment-info .delete-attachment {
+.attachment-info .delete-attachment,
+.attachment-info .trash-attachment {
     display: block;
     text-decoration: none;
@@ -1405 +1406 @@
 }
 
-.attachment-info .delete-attachment {
+.attachment-info .delete-attachment,
+.attachment-info .trash-attachment {
     color: #bc0b0b;
 }
 
-.attachment-info .delete-attachment:hover {
+.attachment-info .delete-attachment:hover,
+.attachment-info .trash-attachment:hover {
     color: red;
 }

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

@@ -5934 +5934 @@
             'change [data-setting] textarea': 'updateSetting',
             'click .delete-attachment':       'deleteAttachment',
+            'click .trash-attachment':        'trashAttachment',
             'click .edit-attachment':         'editAttachment',
             'click .refresh-attachment':      'refreshAttachment'
@@ -5971 +5972 @@
             }
         },
-
+        /**
+         * @param {Object} event
+         */
+        trashAttachment: function( event ) {
+            event.preventDefault();
+
+            this.model.destroy();
+        },
+        /**
+         * @param {Object} event
+         */
         editAttachment: function( event ) {
             event.preventDefault();

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

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