diff options
| author | Roeland Douma <rullzer@users.noreply.github.com> | 2015-07-31 07:31:24 +0200 |
|---|---|---|
| committer | Roeland Douma <rullzer@users.noreply.github.com> | 2015-07-31 07:31:24 +0200 |
| commit | db91b4505ccd105f03cd23ac91e66b4b48b0b38d (patch) | |
| tree | a63efec5284e0ff8d52d78225285792edf3815d8 /settings/js | |
| parent | 519fcee15f50ceea6ee6245f5a49b36cb6c05f4f (diff) | |
| parent | e184157684ad923d5d4107b76d6421e6ae28799d (diff) | |
| download | nextcloud-server-db91b4505ccd105f03cd23ac91e66b4b48b0b38d.tar.gz nextcloud-server-db91b4505ccd105f03cd23ac91e66b4b48b0b38d.zip | |
Merge pull request #17805 from owncloud/avatar-handle-errors
[avatar] add error handlers for avatar setup
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 ac18f525809..9e4dd54090d 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"] |