TT backwards compatibility fix: adds old (pre-multiapp) versionInfo to js.

Also fixed typo in ApplicationConfiguration.

svn changeset:4135/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
index e36c3dceb63bd304189de036a48db1a24fb08b2f..7bdd9d176a2637e67ff9c0a5045ee7ba9d4b83d7 100644 (file)
--- 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 56fab0803c3255d823c0a38b062ee3b67ce50df3..792212ab6125c5bc1d16b9498b602489f74b177a 100644 (file)
--- 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</script>\n");
+        page.write("};\n</script>\n");
 
         boolean testingWindow = testingToolsActive
                 && request.getParameter("TT") != null;