Skip to content

Clicking on theming preview triggers fileupload dialog #4829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
May 12, 2017
Merged

Clicking on theming preview triggers fileupload dialog #4829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2350f2
Clicking on theming preview triggers fileupload dialog
MorrisJobke May 12, 2017
37d333c
Don't open the dialog for logo and background
nickvergessen May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/theming/css/settings-admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ div#theming_settings_msg {
display: inline-block;
}

#theming-preview-logo {
cursor: pointer;
}

#theming-preview {
width: 230px;
height: 140px;
Expand All @@ -97,6 +101,7 @@ div#theming_settings_msg {
text-align: center;
margin-left: 123px;
margin-top: 10px;
cursor: pointer;
}

#theming-preview img {
Expand Down
7 changes: 7 additions & 0 deletions apps/theming/js/settings-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,13 @@ $(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() {
$('#uploadlogo').click();

@nickvergessen nickvergessen May 12, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to stop propagate, otherwise clicking on the logo opens two file dialogs, one for logo one for background

});
$('#theming-preview').on('click', function() {
$('#upload-login-background').click();
});

$('#theming-name').change(function(e) {
var el = $(this);
Expand Down