fixes #1544

svn changeset:4148/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 7bdd9d176a2637e67ff9c0a5045ee7ba9d4b83d7..aefc931c4c07785cd6441ee74253018b32a43056 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
@@ -32,6 +32,10 @@ public class ApplicationConfiguration {
         id = appId;
     }
 
+    public JavaScriptObject getVersionInfoJSObject() {
+        return versionInfo;
+    }
+
     private native void loadFromDOM()
     /*-{
 

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 6a82ad789ffaf9ddf121d80db311155aa5a1c234..1b8f0f0b31716f4bf3c12dd9abbf9d141e5833e1 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -154,15 +154,23 @@ public class ApplicationConnection {
          client.isActive = function() {
              return ap.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::hasActiveRequest()();
          }
-         if ($wnd.itmill.versionInfo) {
+         var vi = ap.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::getVersionInfo()();
+         if (vi) {
              client.getVersionInfo = function() {
-                 return $wnd.itmill.versionInfo;
+                 return vi;
              }
          }
          $wnd.top.itmill.registerToTT(client);
          this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::ttClientWrapper = client;
     }-*/;
 
+    /**
+     * Helper for tt initialization
+     */
+    private JavaScriptObject getVersionInfo() {
+        return configuration.getVersionInfoJSObject();
+    }
+
     private native void uninitializeTestingTools()
     /*-{
          $wnd.top.itmill.unregisterFromTT(this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::ttClientWrapper);

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 792212ab6125c5bc1d16b9498b602489f74b177a..ad206cf326234f11a932d591038f6678b276ed73 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -754,15 +754,6 @@ public class ApplicationServlet extends HttpServlet {
             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</script>\n");