From c2e99110dab66470cb90534cd49033c1280c016b Mon Sep 17 00:00:00 2001 From: iroqueta Date: Thu, 10 Oct 2019 15:09:34 -0300 Subject: [PATCH 1/2] The css and js files that a UC use must have a invalidation token in the URL, doing that the changes that the user do in the UC works without restarting the browser cache. --- .../java/com/genexus/internet/HttpContext.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java index 9fffa2d7d..265797b38 100644 --- a/java/src/main/java/com/genexus/internet/HttpContext.java +++ b/java/src/main/java/com/genexus/internet/HttpContext.java @@ -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 = ""; @@ -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() && !((styleSheet.startsWith("http:")) || (styleSheet.startsWith("https:")))) + { + return "?" + getCacheInvalidationToken(); + } + else + { + return urlBuildNumber; + } + } + private void AddStyleSheetFile(String styleSheet, String urlBuildNumber, boolean isGxThemeHidden) { AddStyleSheetFile( styleSheet, urlBuildNumber, isGxThemeHidden, false); From ff0c5d1146390d2ece61c365ee5dbc614f333c43 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Thu, 10 Oct 2019 18:07:32 -0300 Subject: [PATCH 2/2] Use GXutil.isAbsoluteURL() method to check if the URL is absolute --- java/src/main/java/com/genexus/internet/HttpContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java index 265797b38..3cf08eec1 100644 --- a/java/src/main/java/com/genexus/internet/HttpContext.java +++ b/java/src/main/java/com/genexus/internet/HttpContext.java @@ -493,7 +493,7 @@ public void AddStyleSheetFile(String styleSheet, String urlBuildNumber) private String getURLBuildNumber(String styleSheet, String urlBuildNumber) { - if(urlBuildNumber.isEmpty() && !((styleSheet.startsWith("http:")) || (styleSheet.startsWith("https:")))) + if(urlBuildNumber.isEmpty() && !GXutil.isAbsoluteURL(styleSheet)) { return "?" + getCacheInvalidationToken(); }