From 84a039446c84b40e2d0aad35fbc0407bb3811936 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 14 Dec 2015 11:31:49 -0500 Subject: [PATCH] updated modal to not show parentheses when max file size is not defined... Also fixing hideAlerts error in ACP when opening the upload modal. --- public/src/admin/settings.js | 2 -- public/src/modules/uploader.js | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index d6c9ec3407..b80df5450d 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -113,8 +113,6 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) { uploader.open(uploadBtn.attr('data-route'), {}, 0, function(image) { $('#' + uploadBtn.attr('data-target')).val(image); }); - - uploader.hideAlerts(); }); }); } diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index e951f0aabe..05bf9379b6 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -21,7 +21,7 @@ define('uploader', ['csrf'], function(csrf) { if (fileSize) { uploadForm.find('#file-size-block') - .translateText('[[uploads:maximum-file-size, ' + fileSize + ']]') + .translateText('([[uploads:maximum-file-size, ' + fileSize + ']])') .removeClass('hide'); } else { uploadForm.find('#file-size-block').addClass('hide'); @@ -102,7 +102,7 @@ define('uploader', ['csrf'], function(csrf) { } module.hideAlerts = function(modal) { - modal.find('#alert-status, #alert-success, #alert-error, #upload-progress-box').addClass('hide'); + $(modal).find('#alert-status, #alert-success, #alert-error, #upload-progress-box').addClass('hide'); }; return module;