From 638fe9899be27b8f4f92dc4750f813c1210ecb1f Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Mon, 7 Apr 2008 11:47:16 +0000 Subject: [PATCH] TT backwards compatibility fix: adds old (pre-multiapp) versionInfo to js. Also fixed typo in ApplicationConfiguration. svn changeset:4135/svn branch:trunk --- .../gwt/client/ApplicationConfiguration.java | 2 +- .../terminal/gwt/server/ApplicationServlet.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java index e36c3dceb6..7bdd9d176a 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java @@ -39,7 +39,7 @@ public class ApplicationConfiguration { if($wnd.itmill.toolkitConfigurations && $wnd.itmill.toolkitConfigurations[id]) { var jsobj = $wnd.itmill.toolkitConfigurations[id]; var uri = jsobj.appUri; - if(uri[uri.lenght -1] != "/") { + if(uri[uri.length -1] != "/") { uri = uri + "/"; } this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::appUri = uri; diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 56fab0803c..792212ab61 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -753,8 +753,18 @@ public class ApplicationServlet extends HttpServlet { page.write(application.getVersion()); page.write("\"}"); } + page.write("\n}}\n"); + if (testingToolsActive) { + // TODO backwards compatibility; TT does not (yet) support multiple + // apps on one page + page.write(", versionInfo : {toolkitVersion:\""); + page.write(VERSION); + page.write("\",applicationVersion:\""); + page.write(application.getVersion()); + page.write("\"}"); + } - page.write("\n}}};\n\n"); + page.write("};\n\n"); boolean testingWindow = testingToolsActive && request.getParameter("TT") != null; -- 2.39.5