Media: Simplify upload error message construction.
Merges [40736] to the 4.2 branch. Built from https://develop.svn.wordpress.org/branches/4.2@40742 git-svn-id: http://core.svn.wordpress.org/branches/4.2@40600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
566df4de1a
commit
7f8136dfd7
|
@ -328,15 +328,24 @@ function uploadError(fileObj, errorCode, message, uploader) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function uploadSizeError( up, file, over100mb ) {
|
function uploadSizeError( up, file ) {
|
||||||
var message;
|
var message, errorDiv;
|
||||||
|
|
||||||
if ( over100mb )
|
message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
|
||||||
message = pluploadL10n.big_upload_queued.replace('%s', file.name) + ' ' + pluploadL10n.big_upload_failed.replace('%1$s', '<a class="uploader-html" href="#">').replace('%2$s', '</a>');
|
|
||||||
else
|
|
||||||
message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
|
|
||||||
|
|
||||||
jQuery('#media-items').append('<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>');
|
// Construct the error div.
|
||||||
|
errorDiv = jQuery( '<div />' )
|
||||||
|
.attr( {
|
||||||
|
'id': 'media-item-' + file.id,
|
||||||
|
'class': 'media-item error'
|
||||||
|
} )
|
||||||
|
.append(
|
||||||
|
jQuery( '<p />' )
|
||||||
|
.text( message )
|
||||||
|
);
|
||||||
|
|
||||||
|
// Append the error.
|
||||||
|
jQuery('#media-items').append( errorDiv );
|
||||||
up.removeFile(file);
|
up.removeFile(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue