From 6841b73925a87d212c16078664b5d9ea5e087f7d Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Thu, 22 Nov 2012 12:18:17 +0000 Subject: [PATCH] Uploader: Display a more specific error message when a file exceeds the file size limit. see #21390. git-svn-id: https://develop.svn.wordpress.org/trunk@22822 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/js/plupload/wp-plupload.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wp-includes/js/plupload/wp-plupload.js b/wp-includes/js/plupload/wp-plupload.js index 9d2db5fb31..3b545a4d00 100644 --- a/wp-includes/js/plupload/wp-plupload.js +++ b/wp-includes/js/plupload/wp-plupload.js @@ -226,6 +226,8 @@ window.wp = window.wp || {}; for ( key in Uploader.errorMap ) { if ( pluploadError.code === plupload[ key ] ) { message = Uploader.errorMap[ key ]; + if ( _.isFunction( message ) ) + message = message( pluploadError.file, pluploadError ); break; } } @@ -245,14 +247,17 @@ window.wp = window.wp || {}; Uploader.errorMap = { 'FAILED': pluploadL10n.upload_failed, 'FILE_EXTENSION_ERROR': pluploadL10n.invalid_filetype, - // 'FILE_SIZE_ERROR': '', 'IMAGE_FORMAT_ERROR': pluploadL10n.not_an_image, 'IMAGE_MEMORY_ERROR': pluploadL10n.image_memory_exceeded, 'IMAGE_DIMENSIONS_ERROR': pluploadL10n.image_dimensions_exceeded, 'GENERIC_ERROR': pluploadL10n.upload_failed, 'IO_ERROR': pluploadL10n.io_error, 'HTTP_ERROR': pluploadL10n.http_error, - 'SECURITY_ERROR': pluploadL10n.security_error + 'SECURITY_ERROR': pluploadL10n.security_error, + + 'FILE_SIZE_ERROR': function( file ) { + return pluploadL10n.file_exceeds_size_limit.replace('%s', file.name); + } }; $.extend( Uploader.prototype, {