aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill
diff options
context:
space:
mode:
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>2006-12-29 18:05:24 +0000
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>2006-12-29 18:05:24 +0000
commitc218dd148009eccbc335f6cb780bc2ba7d66f8f3 (patch)
tree168346ace04f428393b766f92dec45a7327f32a7 /src/com/itmill
parentf46b95c3b805f8b2a16d9ffd3ceffab620922fb9 (diff)
downloadvaadin-framework-c218dd148009eccbc335f6cb780bc2ba7d66f8f3.tar.gz
vaadin-framework-c218dd148009eccbc335f6cb780bc2ba7d66f8f3.zip
Fixed jetty related bug
svn changeset:195/svn branch:toolkit
Diffstat (limited to 'src/com/itmill')
-rw-r--r--src/com/itmill/toolkit/terminal/web/ApplicationServlet.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 24f9390aff..af16b23f35 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -693,12 +693,13 @@ public class ApplicationServlet extends HttpServlet implements
page.write("<div id=\"ajax-window\"></div>\n");
page.write("<script language=\"JavaScript\">\n");
+ String appUrl = getApplicationUrl(request).toString();
page
.write("var client = new ITMillToolkitClient("
+ "document.getElementById('ajax-window'),"
+ "\""
- + getApplicationUrl(request)
- + "/UIDL/"
+ + appUrl + (appUrl.endsWith("/") ? "" : "/")
+ + "UIDL/"
+ "\",\""
+ resourcePath + ((Theme)themes.get(themes.size()-1)).getName() + "/"