diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-02-07 17:02:34 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-02-07 17:02:34 +0000 |
| commit | c3c33ce4b37acc27f44f3de255541bd8a0f4f1cd (patch) | |
| tree | b3c9cf0037243bdc584498d8850ee6e2ffbe907c /src | |
| parent | 7ffe551e8009c1fac2431a194a4c4b9cf4f2210e (diff) | |
| download | vaadin-framework-c3c33ce4b37acc27f44f3de255541bd8a0f4f1cd.tar.gz vaadin-framework-c3c33ce4b37acc27f44f3de255541bd8a0f4f1cd.zip | |
Now deployment to port 80 should work also with safari
svn changeset:536/svn branch:toolkit
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index 02d53c150d..ecbe91fb94 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -851,13 +851,14 @@ public class ApplicationServlet extends HttpServlet implements page.write("<script language=\"JavaScript\">\n"); String appUrl = getApplicationUrl(request).toString(); + if (appUrl.endsWith("/")) appUrl = appUrl.substring(0,appUrl.length()-1); + if (appUrl.endsWith(":80")) appUrl = appUrl.substring(0,appUrl.length()-3); page .write("var client = new itmill.Client(" + "document.getElementById('ajax-window')," + "\"" - + appUrl - + (appUrl.endsWith("/") ? "" : "/") - + "UIDL/" + + appUrl + + "/UIDL/" + "\",\"" + resourcePath + ((Theme) themes |