diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-22 13:13:39 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-31 07:35:01 +0200 |
| commit | ef2eeae85243d2ebeaca2667e5f6b7e34265e0f3 (patch) | |
| tree | 2b9ee6cdee9d87282ce1ff9e3a5250e1834db2bf /settings/js | |
| parent | b8e8e3fdafb139f46a0b0afefc620908d3773943 (diff) | |
| download | nextcloud-server-ef2eeae85243d2ebeaca2667e5f6b7e34265e0f3.tar.gz nextcloud-server-ef2eeae85243d2ebeaca2667e5f6b7e34265e0f3.zip | |
[avatar] add error handlers for avatar setup
add colon to translated string
use placeholder in t()
Adding a size limitation for avatar upload
Unit test for file size
Fix typo & display server side error message
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/personal.js | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index 3745b1372ea..a65e087cf84 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -234,6 +234,20 @@ $(document).ready(function () { var uploadparms = { done: function (e, data) { avatarResponseHandler(data.result); + }, + fail: function (e, data){ + var msg = data.jqXHR.statusText + ' (' + data.jqXHR.status + ')'; + if (!_.isUndefined(data.jqXHR.responseJSON) && + !_.isUndefined(data.jqXHR.responseJSON.data) && + !_.isUndefined(data.jqXHR.responseJSON.data.message) + ) { + msg = data.jqXHR.responseJSON.data.message; + } + avatarResponseHandler({ + data: { + message: t('settings', 'An error occurred: {message}', { message: msg }) + } + }); } }; @@ -247,7 +261,25 @@ $(document).ready(function () { OC.dialogs.filepicker( t('settings', "Select a profile picture"), function (path) { - $.post(OC.generateUrl('/avatar/'), {path: path}, avatarResponseHandler); + $.ajax({ + type: "POST", + url: OC.generateUrl('/avatar/'), + data: { path: path } + }).done(avatarResponseHandler) + .fail(function(jqXHR, status){ + var msg = jqXHR.statusText + ' (' + jqXHR.status + ')'; + if (!_.isUndefined(jqXHR.responseJSON) && + !_.isUndefined(jqXHR.responseJSON.data) && + !_.isUndefined(jqXHR.responseJSON.data.message) + ) { + msg = jqXHR.responseJSON.data.message; + } + avatarResponseHandler({ + data: { + message: t('settings', 'An error occurred: {message}', { message: msg }) + } + }); + }); }, false, ["image/png", "image/jpeg"] |