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.

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

[stable12] Use base url for cache prefix and SCSS caching #5584

Merged
merged 5 commits into from Jul 5, 2017

Conversation

@juliushaertl
Member

juliushaertl commented Jul 2, 2017

backport of #5429

juliushaertl added some commits Jun 15, 2017

Make cache and scss caching depend on the baseUrl
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Do not open version file again
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Add tests and inject IRequest
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix theming app to also use the prefix
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Jul 2, 2017

@juliushaertl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rullzer, @tanghus and @MorrisJobke to be potential reviewers.

mention-bot commented Jul 2, 2017

@juliushaertl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rullzer, @tanghus and @MorrisJobke to be potential reviewers.

@MorrisJobke

Tested and works 👍

@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Jul 5, 2017

Member

Please review :)

Member

MorrisJobke commented Jul 5, 2017

Please review :)

@nickvergessen nickvergessen merged commit 8b2d925 into stable12 Jul 5, 2017

1 of 2 checks passed

continuous-integration/drone/push the build failed
Details
continuous-integration/drone/pr the build was successful
Details

@nickvergessen nickvergessen deleted the stable12-5429 branch Jul 5, 2017

danxuliu added a commit that referenced this pull request Aug 10, 2017

Provide "server.css" URL in ThemingController response
Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

danxuliu added a commit that referenced this pull request Aug 10, 2017

Fix preview of theming
Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment