[10.2.1] Do not try to override JS files from theme when there is no custom th…#35709
Merged
patrickjahns merged 1 commit intorelease-10.2.1from Jul 1, 2019
Merged
Conversation
11 tasks
phil-davis
approved these changes
Jul 1, 2019
11 tasks
10 tasks
This file contains hidden or 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
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.
…eme active
Description
Backport of #35698
For the multi-appdir installation with no custom theme applied the
appsapp directory always wins while searching for the js resourcesthis contradicts the expectation that an appdir with the most recent application version should win
Related Issue
Motivation and Context
Outdated JS is loaded after update
How Has This Been Tested?
apps(default installation)apps-externalExpected
script is loaded from
apps-externalActual
script is loaded from
appsBonus
Enable a custom theme and put the same script into
app-theme/apps/appid/jsExpected
Script is no longer loaded from
apps-externalbut from the themeScreenshots (if appropriate):
Types of changes
Checklist: