From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Wed, 7 Feb 2007 17:02:34 +0000 (+0000)
Subject: Now deployment to port 80 should work also with safari
X-Git-Tag: 6.7.0.beta1~6658
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c3c33ce4b37acc27f44f3de255541bd8a0f4f1cd;p=vaadin-framework.git

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 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