summaryrefslogtreecommitdiffstats
path: root/apps/theming/js/settings-admin.js
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-10-15 21:44:48 +0200
committerGitHub <noreply@github.com>2017-10-15 21:44:48 +0200
commit1b2568e6370f592d0be0e7e103c0e3ed073d2a71 (patch)
tree3ecf659ad5acd17ec35735ea56c3d966b98e982c /apps/theming/js/settings-admin.js
parenta5912cbe33649236dd3edf284b1182d7cf39819b (diff)
parentf15e85c4f50b6c9e77742e15f8291a8628a28ef7 (diff)
downloadnextcloud-server-1b2568e6370f592d0be0e7e103c0e3ed073d2a71.tar.gz
nextcloud-server-1b2568e6370f592d0be0e7e103c0e3ed073d2a71.zip
Merge pull request #6585 from nextcloud/theming-fileupload-errorhandling
Theming: Handle errors on uploaded files properly
Diffstat (limited to 'apps/theming/js/settings-admin.js')
-rw-r--r--apps/theming/js/settings-admin.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index d9e66284d14..44a799a19b4 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -141,6 +141,7 @@ $(document).ready(function () {
fail: function (e, response){
OC.msg.finishedError('#theming_settings_msg', response._response.jqXHR.responseJSON.data.message);
$('label#uploadlogo').addClass('icon-upload').removeClass('icon-loading-small');
+ $('#theming_settings_loading').hide();
}
};
var uploadParamsLogin = {
@@ -159,6 +160,7 @@ $(document).ready(function () {
fail: function (e, response){
$('label#upload-login-background').removeClass('icon-loading-small').addClass('icon-upload');
OC.msg.finishedError('#theming_settings_msg', response._response.jqXHR.responseJSON.data.message);
+ $('#theming_settings_loading').hide();
}
};