Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-05-12 10:48:51 +0300
committerJoas Schilling <coding@schilljs.com>2017-05-12 10:48:51 +0300
commit37d333c3b55c6e2ed7c3e399c0c9d24b06bb2684 (patch)
tree258e7933cacc24562f53e005f970719104708ed0 /apps/theming/js
parentc2350f237ecf35e716c827ae92066059ecc43f2e (diff)
Don't open the dialog for logo and background
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/theming/js')
-rw-r--r--apps/theming/js/settings-admin.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index d4ecba5a141..48c479cc9c3 100644
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -161,7 +161,8 @@ $(document).ready(function () {
$('#uploadlogo').fileupload(uploadParamsLogo);
$('#upload-login-background').fileupload(uploadParamsLogin);
// clicking preview should also trigger file upload dialog
- $('#theming-preview-logo').on('click', function() {
+ $('#theming-preview-logo').on('click', function(e) {
+ e.stopPropagation();
$('#uploadlogo').click();
});
$('#theming-preview').on('click', function() {