Changeset 22869

Timestamp:

11/27/2012 03:50:59 PM (14 years ago)

Author:

ryan

Message:

Add a delete link to the media modal.

Props merty, nacin, koopersmith
fixes #22524

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/css/media-views.css (modified) (1 diff)
• wp-includes/js/media-models.js (modified) (4 diffs)
• wp-includes/js/media-views.js (modified) (1 diff)
• wp-includes/media.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

@@ -1844 +1844 @@
                 wp_send_json_error();
 
-        check_ajax_referer( 'save-attachment', 'nonce' );
+        check_ajax_referer( 'update-post_' . $id, 'nonce' );
 
         if ( ! current_user_can( 'edit_post', $id ) )
@@ -1890 +1890 @@
         $attachment_data = $_REQUEST['attachments'][ $id ];
 
-        check_ajax_referer( 'save-attachment', 'nonce' );
+        check_ajax_referer( 'update-post_' . $id, 'nonce' );
 
         if ( ! current_user_can( 'edit_post', $id ) )

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

@@ -1192 +1192 @@
 }
 
+.attachment-info .delete-attachment a {
+        color: red;
+        padding: 2px 4px;
+        margin: -2px -4px;
+        text-decoration: none;
+}
+
+.attachment-info .delete-attachment a:hover {
+        color: #fff;
+        background: red;
+}
+
 /**
  * Attachment Display Settings

trunk/wp-includes/js/media-models.js

@@ -219 +219 @@
         Attachment = media.model.Attachment = Backbone.Model.extend({
                 sync: function( method, model, options ) {
+                        // If the attachment does not yet have an `id`, return an instantly
+                        // rejected promise. Otherwise, all of our requests will fail.
+                        if ( _.isUndefined( this.id ) )
+                                return $.Deferred().reject().promise();
+
                         // Overload the `read` request so Attachment.fetch() functions correctly.
                         if ( 'read' === method ) {
@@ -238 +243 @@
                                         action:  'save-attachment',
                                         id:      this.id,
-                                        nonce:   media.model.settings.saveAttachmentNonce,
+                                        nonce:   this.get('nonces').update,
                                         post_id: media.model.settings.postId
                                 });
@@ -253 +258 @@
 
                                 return media.ajax( options );
+
+                        // Overload the `delete` request so attachments can be removed.
+                        // This will permanently delete an attachment.
+                        } else if ( 'delete' === method ) {
+                                options = options || {};
+                                options.context = this;
+                                options.data = _.extend( options.data || {}, {
+                                        action:   'delete-post',
+                                        id:       this.id,
+                                        _wpnonce: this.get('nonces')['delete']
+                                });
+                                return media.ajax( options );
                         }
                 },
@@ -271 +288 @@
                         return media.post( 'save-attachment-compat', _.defaults({
                                 id:      this.id,
-                                nonce:   media.model.settings.saveAttachmentNonce,
+                                nonce:   this.get('nonces').update,
                                 post_id: media.model.settings.postId
                         }, data ) ).done( function( resp, status, xhr ) {

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

@@ -3407 +3407 @@
                         'change [data-setting] input':    'updateSetting',
                         'change [data-setting] select':   'updateSetting',
-                        'change [data-setting] textarea': 'updateSetting'
+                        'change [data-setting] textarea': 'updateSetting',
+                        'click .delete-attachment':       'deleteAttachment'
+                },
+
+                deleteAttachment: function(event) {
+                        event.preventDefault();
+
+                        if ( confirm( l10n.warnDelete ) )
+                                this.model.destroy();
                 }
         });

trunk/wp-includes/media.php

@@ -1328 +1328 @@
                 'icon'        => wp_mime_type_icon( $attachment->ID ),
                 'dateFormatted' => mysql2date( get_option('date_format'), $attachment->post_date ),
+                'nonces'      => array(
+                        'update' => wp_create_nonce( 'update-post_' . $attachment->ID ),
+                        'delete' => wp_create_nonce( 'delete-post_' . $attachment->ID ),
+                ),
         );
 
@@ -1453 +1457 @@
                 'insertIntoPost'     => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
                 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
+                'warnDelete' =>      __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
 
                 // From URL
@@ -1641 +1646 @@
                                 <# if ( 'image' === data.type && ! data.uploading ) { #>
                                         <div class="dimensions">{{ data.width }} &times; {{ data.height }}</div>
+                                <# } #>
+                                <# if ( ! data.uploading ) { #>
+                                        <div class="delete-attachment">
+                                                <a href="#"><?php _e( 'Delete Permanently' ); ?></a>
+                                        </div>
                                 <# } #>
                         </div>

trunk/wp-includes/script-loader.php

@@ -323 +323 @@
         did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
                 'settings' => array(
-                        'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
                         'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
                         'postId'  => 0,