Clicking on theming preview triggers fileupload dialog #4829
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Morris Jobke <[email protected]>
MorrisJobke
added
design
|
@MorrisJobke, thanks for your PR! By analyzing the history of the files in this pull request, we identified @juliushaertl, @schiessle and @LukasReschke to be potential reviewers. |
MorrisJobke
requested review from
rullzer,
nickvergessen,
LukasReschke,
jancborchardt,
juliusknorr and
skjnldsv
apps/theming/js/settings-admin.js
Outdated
| @@ -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(); | |||
There was a problem hiding this comment.
Need to stop propagate, otherwise clicking on the logo opens two file dialogs, one for logo one for background
Signed-off-by: Joas Schilling <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #4829 +/- ##
============================================
+ Coverage 54.19% 54.19% +<.01%
Complexity 22149 22149
============================================
Files 1363 1363
Lines 84820 84820
Branches 1322 1322
============================================
+ Hits 45966 45970 +4
+ Misses 38854 38850 -4
|
nickvergessen
approved these changes
May 12, 2017
rullzer
approved these changes
May 12, 2017
rullzer
added
4. to release
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a paper cut from #2672