diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-10-08 13:39:57 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-10-08 13:39:57 +0000 |
| commit | d5e956890c9a08915ecd0e0ebf9f59c42f7edd7c (patch) | |
| tree | c7173a22d0661a3aeb7dc103e48d679564b30ad0 | |
| parent | 0114b12e8f81fdf25206267f943a857bb9fa4ed8 (diff) | |
| download | vaadin-framework-d5e956890c9a08915ecd0e0ebf9f59c42f7edd7c.tar.gz vaadin-framework-d5e956890c9a08915ecd0e0ebf9f59c42f7edd7c.zip | |
Fixes #971
svn changeset:2459/svn branch:trunk
| -rw-r--r-- | WebContent/reservr.html | 4 | ||||
| -rwxr-xr-x | src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/WebContent/reservr.html b/WebContent/reservr.html index 196ce09012..20db089d83 100644 --- a/WebContent/reservr.html +++ b/WebContent/reservr.html @@ -4,12 +4,12 @@ <title>IT Mill Toolkit 5 Demo: Reservr</title>
<script type="text/javascript">
var itmtk = {
- appUri:'/toolkit/Reservr', pathInfo: '/'
+ appUri:'Reservr', pathInfo: '/'
};
</script>
<script src="http://maps.google.com/maps?file=api&v=2" type="text/javascript"></script>
<script language='javascript' src='ITK-INF/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet/com.itmill.toolkit.demo.reservation.gwt.WidgetSet.nocache.js'></script>
- <link REL="stylesheet" TYPE="text/css" HREF="/toolkit/ITK-INF/themes/reservr/styles.css">
+ <link REL="stylesheet" TYPE="text/css" HREF="ITK-INF/themes/reservr/styles.css">
</head>
<body>
<iframe id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index c5f63ac33a..0d6ab62313 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -74,7 +74,9 @@ public class ApplicationConnection implements FocusListener { }-*/; public native String getAppUri()/*-{ - return $wnd.itmtk.appUri; + var u = $wnd.itmtk.appUri; + if (u.indexOf("/") != 0 && u.indexOf("http") != 0) u = "../../../" +u; + return u; }-*/; private native String getPathInfo()/*-{ |