Ticket #5911: 5911-27.diff
File 5911-27.diff, 5.4 KB (added by , 13 years ago) |
---|
-
wp-includes/js/swfupload/handlers.js
55 55 // Bind AJAX to the new Delete button 56 56 jQuery('#media-item-' + fileObj.id + ' a.delete').bind('click',function(){ 57 57 // Tell the server to delete it. TODO: handle exceptions 58 jQuery.ajax({url:'admin-ajax.php',type:'post', data:{58 jQuery.ajax({url:'admin-ajax.php',type:'post',success:deleteSuccess,error:deleteError,id:fileObj.id,data:{ 59 59 id : this.id.replace(/[^0-9]/g,''), 60 60 action : 'delete-post', 61 61 _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')} 62 62 }); 63 64 // Decrement the counters.65 if ( type = jQuery('#type-of-' + this.id.replace(/[^0-9]/g,'')).val() )66 jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-1);67 if ( jQuery(this).parents('.media-item').eq(0).hasClass('child-of-'+post_id) )68 jQuery('#attachments-count').text(jQuery('#attachments-count').text()-1);69 70 // Vanish it.71 jQuery(this).parents(".media-item").eq(0).slideToggle(300,function(){jQuery(this).remove();if(jQuery('.media-item').length==0)jQuery('.insert-gallery').hide();updateMediaForm();});72 63 return false; 73 64 }); 74 65 … … 79 70 .parent().eq(0).children('.toggle').toggle(); 80 71 } 81 72 73 function itemAjaxError(id, html) { 74 var error = jQuery('#media-item-error' + id); 75 76 error.html('<div class="file-error"><button type="button" id="dismiss-'+id+'" class="button dismiss">'+swfuploadL10n.dismiss+'</button>'+html+'</div>'); 77 jQuery('#dismiss-'+id).click(function(){jQuery(this).parents('.file-error').slideUp(200, function(){jQuery(this).empty();})}); 78 } 79 80 function deleteSuccess(data, textStatus) { 81 if ( data == '-1' ) 82 return itemAjaxError(this.id, 'You do not have permission. Has your session expired?'); 83 if ( data == '0' ) 84 return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?'); 85 86 var item = jQuery('#media-item-' + this.id); 87 88 // Decrement the counters. 89 if ( type = jQuery('#type-of-' + this.id).val() ) 90 jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-1); 91 if ( item.hasClass('child-of-'+post_id) ) 92 jQuery('#attachments-count').text(jQuery('#attachments-count').text()-1); 93 94 if ( jQuery('.type-form #media-items>*').length == 1 && jQuery('#media-items .hidden').length > 0 ) { 95 jQuery('.toggle').toggle(); 96 jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden'); 97 } 98 99 jQuery('#media-item-' + this.id + ' .filename:empty').remove(); 100 jQuery('#media-item-' + this.id + ' .filename').append(' <span class="file-error">'+swfuploadL10n.deleted+'</span>').siblings('a.toggle').remove(); 101 jQuery('#media-item-' + this.id + ' .describe').slideUp(500, function(){jQuery(this).parents('.media-item').slideUp(1500,function(){jQuery(this).remove();updateMediaForm();})}).end.remove(); 102 103 return; 104 // Vanish it. 105 item.slideToggle(300,function(){jQuery(this).remove();if(jQuery('.media-item').length==0)jQuery('.insert-gallery').hide();updateMediaForm();}); 106 } 107 108 function deleteError(X, textStatus, errorThrown) { 109 // TODO 110 } 111 82 112 function updateMediaForm() { 83 113 // Just one file, no need for collapsible part 84 114 if ( jQuery('.type-form #media-items>*').length == 1 ) { … … 130 160 131 161 // file-specific message 132 162 function wpFileError(fileObj, message) { 133 jQuery('#media-item-' + fileObj.id + ' .filename').after('<div class="file-error"><button type="button" class="button dismiss">'+swfuploadL10n.dismiss+'</button>'+message+'</div>').siblings('.progress').remove();134 jQuery(' .dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});163 jQuery('#media-item-' + fileObj.id + ' .filename').after('<div class="file-error"><button type="button" id="dismiss-' + fileObj.id + '" class="button dismiss">'+swfuploadL10n.dismiss+'</button>'+message+'</div>').siblings('.toggle').remove(); 164 jQuery('#dismiss-' + fileObj.id).click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})}); 135 165 } 136 166 137 167 function fileQueueError(fileObj, error_code, message) { -
wp-includes/script-loader.php
84 84 $this->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.0.2'); 85 85 $this->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.0.2'); 86 86 $this->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2'); 87 $this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080 228');87 $this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080301'); 88 88 // these error messages came from the sample swfupload js, they might need changing. 89 89 $this->localize( 'swfupload-handlers', 'swfuploadL10n', array( 90 90 'queue_limit_exceeded' => __('You have attempted to queue too many files.'), … … 102 102 'upload_stopped' => __('Upload stopped.'), 103 103 'dismiss' => __('Dismiss'), 104 104 'crunching' => __('Crunching…'), 105 'deleted' => __('Deleted'), 105 106 ) ); 106 107 107 108 $this->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery'), '3' );