Ticket #13502: 13502-ajaxdelete.patch

wp-admin/admin-ajax.php

@@ -421 +421 @@
                 die('1');
         die('0');
         break;
+case 'delete-attachment' :
 case 'delete-post' :
         check_ajax_referer( "{$action}_$id" );
         if ( !current_user_can( 'delete_post', $id ) )
@@ -434 +435 @@
         else
                 die('0');
         break;
+case 'trash-attachment' :
+case 'untrash-attachment' :
 case 'trash-post' :
 case 'untrash-post' :
         check_ajax_referer( "{$action}_$id" );

wp-admin/includes/media.php

@@ -1272 +1272 @@
                 } elseif ( !MEDIA_TRASH ) {
                         $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
                          <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
-                         <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
+                         <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='button continue'>" . __( 'Continue' ) . "</a>
                          <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
                          </div>";
                 } else {

wp-includes/js/swfupload/handlers.dev.js

@@ -93 +93 @@
         });
 
         // Bind AJAX to the new Delete button
-        jQuery('a.delete', item).click(function(){
+        jQuery('a.continue', item).click(function(){
                 // Tell the server to delete it. TODO: handle exceptions
                 jQuery.ajax({
                         url: 'admin-ajax.php',
@@ -101 +101 @@
                         success: deleteSuccess,
                         error: deleteError,
                         id: fileObj.id,
+                        data:{
+                                id : this.id.replace(/[^0-9]/g,''),
+                                action : 'delete-attachment',
+                                _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')
+                        }
+                });
+
+                return false;
+        });
+
+        // Bind AJAX to the new Trash button
+        jQuery('a.delete', item).click(function(){
+
+                // Tell the server to trash it. TODO: handle exceptions
+                jQuery.ajax({
+                        url: 'admin-ajax.php',
+                        type: 'post',
+                        success: trashSuccess,
+                        error: trashError,
+                        id: fileObj.id,
                         data: {
                                 id : this.id.replace(/[^0-9]/g, ''),
-                                action : 'trash-post',
+                                action : 'trash-attachment',
                                 _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')
                         }
                 });
@@ -119 +139 @@
                         id: fileObj.id,
                         data: {
                                 id : this.id.replace(/[^0-9]/g,''),
-                                action: 'untrash-post',
+                                action: 'untrash-attachment',
                                 _ajax_nonce: this.href.replace(/^.*wpnonce=/,'')
                         },
                         success: function(data, textStatus){
@@ -176 +196 @@
         }
 
         // Vanish it.
+        jQuery('.filename:empty', item).remove(); 
+        jQuery('.filename .title', item).css('font-weight','bold');
+        jQuery('.filename', item).append(' <span class="deletednotice">'+swfuploadL10n.deleted+'</span>').siblings('a.toggle').remove(); 
+        jQuery('#media-item-' + this.id).children('.describe').css({backgroundColor:'#fff'}).end() 
+                .animate({backgroundColor:'#ffc0c0'}, {queue:false,duration:50}) 
+                .animate({minHeight:0,height:36}, 400, null, function(){jQuery(this).children('.describe').remove()}) 
+                .animate({backgroundColor:'#fff'}, 400) 
+                .animate({height:0}, 800, null, function(){
+                                        jQuery(this).remove();
+                                        updateMediaForm();
+                                }); 
+
+        return;
+}
+
+function trashSuccess(data, textStatus) {
+        if ( data == '-1' )
+                return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
+        if ( data == '0' )
+                return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
+
+        var id = this.id, item = jQuery('#media-item-' + id);
+
+        // Decrement the counters.
+        if ( type = jQuery('#type-of-' + id).val() )
+                jQuery('#' + type + '-counter').text( jQuery('#' + type + '-counter').text() - 1 );
+        if ( item.hasClass('child-of-'+post_id) )
+                jQuery('#attachments-count').text( jQuery('#attachments-count').text() - 1 );
+
+        if ( jQuery('form.type-form #media-items').children().length == 1 && jQuery('.hidden', '#media-items').length > 0 ) {
+                jQuery('.toggle').toggle();
+                jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
+        }
+
+        // Vanish it.
         jQuery('.toggle', item).toggle();
         jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
         item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass('undo');
 
         jQuery('.filename:empty', item).remove();
         jQuery('.filename .title', item).css('font-weight','bold');
-        jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
+        jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.trashed + ' </span>').siblings('a.toggle').hide();
         jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
         jQuery('.menu_order_input', item).hide();
 
@@ -193 +248 @@
         // TODO
 }
 
+function trashError(X, textStatus, errorThrown) {
+        // TODO
+}
+
 function updateMediaForm() {
         var one = jQuery('form.type-form #media-items').children(), items = jQuery('#media-items').children();
 

wp-includes/script-loader.php

@@ -211 +211 @@
                         'upload_stopped' => __('Upload stopped.'),
                         'dismiss' => __('Dismiss'),
                         'crunching' => __('Crunching…'),
-                        'deleted' => __('moved to the trash.'),
+                        'deleted' => __('deleted.'),
+                        'trashed' =>  __('moved to the trash.'),
                         'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};',
                         'error_uploading' => __('“%s” has failed to upload due to an error')
         ) );