Now deployment to port 80 should work also with safari

svn changeset:536/svn branch:toolkit

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 02d53c150d2c1cd1b03fb2999b7d984aeb4a61a1..ecbe91fb943d8238cf730a80373de306aeb230ad 100644 (file)
--- 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