Skip to content

The css and js files that a UC use must have a invalidation token in … #130

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
merged 3 commits into from
Oct 11, 2019
Merged

The css and js files that a UC use must have a invalidation token in … #130

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2e9911
The css and js files that a UC use must have a invalidation token in …
iroqueta Oct 10, 2019
ff0c5d1
Use GXutil.isAbsoluteURL() method to check if the URL is absolute
iroqueta Oct 10, 2019
41293cd
Merge branch 'master' into CssInvalidationToken
iroqueta Oct 11, 2019
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
14 changes: 14 additions & 0 deletions java/src/main/java/com/genexus/internet/HttpContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean use
{
if(!javascriptSources.contains(jsSrc))
{
urlBuildNumber = getURLBuildNumber(jsSrc, urlBuildNumber);
javascriptSources.add(jsSrc);
String queryString = urlBuildNumber;
String attributes = "";
Expand Down Expand Up @@ -486,9 +487,22 @@ public void AddStyleSheetFile(String styleSheet)
}
public void AddStyleSheetFile(String styleSheet, String urlBuildNumber)
{
urlBuildNumber = getURLBuildNumber(styleSheet, urlBuildNumber);
AddStyleSheetFile(styleSheet, urlBuildNumber, false);
}

private String getURLBuildNumber(String styleSheet, String urlBuildNumber)
{
if(urlBuildNumber.isEmpty() && !GXutil.isAbsoluteURL(styleSheet))
{
return "?" + getCacheInvalidationToken();
}
else
{
return urlBuildNumber;
}
}

private void AddStyleSheetFile(String styleSheet, String urlBuildNumber, boolean isGxThemeHidden)
{
AddStyleSheetFile( styleSheet, urlBuildNumber, isGxThemeHidden, false);
Expand Down