From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Wed, 7 Feb 2007 19:20:41 +0000 (+0000)
Subject: Fixed deployment to :80 with safari (again)
X-Git-Tag: 6.7.0.beta1~6645
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=184f46fd2937bbcbb80b841fd839566c10525af1;p=vaadin-framework.git

Fixed deployment to :80 with safari (again)

svn changeset:553/svn branch:toolkit
---

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index ecbe91fb94..df663d1203 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -850,9 +850,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();
+		
+		String[] urlParts = getApplicationUrl(request).toString().split("\\/");
+		if (urlParts[2].endsWith(":80")) urlParts[2] = urlParts[2].substring(0,urlParts[2].length()-3);
+		String appUrl = "";
+		for (int i=0; i<urlParts.length; i++)
+			appUrl += (i>0?"/":"") + urlParts[i];
 		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'),"