Better display handling of error messages during swfupload uploading. Fixes #12225

git-svn-id: https://develop.svn.wordpress.org/trunk@14816 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse
2010-05-23 10:59:52 +00:00
parent ca3fead69d
commit bc726afc10
5 changed files with 30 additions and 15 deletions

View File

@@ -145,10 +145,15 @@ function prepareMediaItemInit(fileObj) {
}
function itemAjaxError(id, html) {
var error = jQuery('#media-item-error' + id);
var item = jQuery('#media-item-' + id);
var filename = jQuery('.filename', item).text();
error.html('<div class="file-error"><button type="button" id="dismiss-'+id+'" class="button dismiss">'+swfuploadL10n.dismiss+'</button>'+html+'</div>');
jQuery('#dismiss-'+id).click(function(){jQuery(this).parents('.file-error').slideUp(200, function(){jQuery(this).empty();})});
item.html('<div class="error-div">'
+ '<a class="dismiss" href="#">' + swfuploadL10n.dismiss + '</a>'
+ '<strong>' + swfuploadL10n.error_uploading.replace('%s', filename) + '</strong><br />'
+ html
+ '</div>');
item.find('a.dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
}
function deleteSuccess(data, textStatus) {
@@ -242,8 +247,15 @@ function wpQueueError(message) {
// file-specific message
function wpFileError(fileObj, message) {
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();
jQuery('#dismiss-' + fileObj.id).click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
var item = jQuery('#media-item-' + fileObj.id);
var filename = jQuery('.filename', item).text();
item.html('<div class="error-div">'
+ '<a class="dismiss" href="#">' + swfuploadL10n.dismiss + '</a>'
+ '<strong>' + swfuploadL10n.error_uploading.replace('%s', filename) + '</strong><br />'
+ message
+ '</div>');
item.find('a.dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
}
function fileQueueError(fileObj, error_code, message) {
@@ -355,4 +367,4 @@ jQuery(document).ready(function($){
$(this).siblings('.urlfield').val( $(this).attr('title') );
}
});
});
});

File diff suppressed because one or more lines are too long