aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2008-11-27 14:41:14 +0000
committerMarc Englund <marc.englund@itmill.com>2008-11-27 14:41:14 +0000
commit19e0b19b2de954ed8d06dd1efacf654bc9c16b97 (patch)
tree7faa15a23ce3f4031ff9d7df4ec7bec92c118b40
parentddcd1d0716699a1e29834f93fc1d0f14c28e6473 (diff)
downloadvaadin-framework-19e0b19b2de954ed8d06dd1efacf654bc9c16b97.tar.gz
vaadin-framework-19e0b19b2de954ed8d06dd1efacf654bc9c16b97.zip
Timestamp parameter after .nocache.js to avoid caching. Fixes #2220
svn changeset:6019/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 47d56f4cef..589e6e4bc7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -18,6 +18,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.security.GeneralSecurityException;
import java.util.Collection;
+import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -883,7 +884,8 @@ public class ApplicationServlet extends HttpServlet {
+ "hidden\" src=\"javascript:false\"></iframe>\n");
page.write("<script language='javascript' src='" + staticFilePath
+ "/" + WIDGETSET_DIRECTORY_PATH + widgetset + "/"
- + widgetset + ".nocache.js'></script>\n");
+ + widgetset + ".nocache.js?" + new Date().getTime()
+ + "'></script>\n");
page.write("<script type=\"text/javascript\">\n");
page.write("//<![CDATA[\n");
page.write("if(!itmill || !itmill.toolkitConfigurations) {\n "
@@ -944,8 +946,8 @@ public class ApplicationServlet extends HttpServlet {
+ "hidden\" src=\"javascript:false\"></iframe>');\n");
page.write("document.write(\"<script language='javascript' src='"
+ staticFilePath + "/" + WIDGETSET_DIRECTORY_PATH
- + widgetset + "/" + widgetset
- + ".nocache.js'><\\/script>\");\n}\n");
+ + widgetset + "/" + widgetset + ".nocache.js?"
+ + new Date().getTime() + "'><\\/script>\");\n}\n");
page.write("itmill.toolkitConfigurations[\"" + appId + "\"] = {");
page.write("appUri:'" + appUrl + "', ");