Skip to content

Commit 8c7ea71

Browse files
committed
Media: Simplify upload error message construction.
Built from https://develop.svn.wordpress.org/trunk@40736 git-svn-id: http://core.svn.wordpress.org/trunk@40594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent 38347d7 commit 8c7ea71

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

Diff for: wp-includes/js/plupload/handlers.js

+18-9
Original file line numberDiff line numberDiff line change
@@ -328,15 +328,24 @@ function uploadError(fileObj, errorCode, message, uploader) {
328328
}
329329
}
330330

331-
function uploadSizeError( up, file, over100mb ) {
332-
var message;
333-
334-
if ( over100mb )
335-
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>');
336-
else
337-
message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
338-
339-
jQuery('#media-items').append('<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>');
331+
function uploadSizeError( up, file ) {
332+
var message, errorDiv;
333+
334+
message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
335+
336+
// Construct the error div.
337+
errorDiv = jQuery( '<div />' )
338+
.attr( {
339+
'id': 'media-item-' + file.id,
340+
'class': 'media-item error'
341+
} )
342+
.append(
343+
jQuery( '<p />' )
344+
.text( message )
345+
);
346+
347+
// Append the error.
348+
jQuery('#media-items').append( errorDiv );
340349
up.removeFile(file);
341350
}
342351

0 commit comments

Comments
 (0)