]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixes #971
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>
Mon, 8 Oct 2007 13:39:57 +0000 (13:39 +0000)
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>
Mon, 8 Oct 2007 13:39:57 +0000 (13:39 +0000)
svn changeset:2459/svn branch:trunk

WebContent/reservr.html
src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java

index 196ce090127bbc0532aa6dc37dfbc19667d7c425..20db089d83fdcaa2a2c9905ba2fd860d1087baa8 100644 (file)
@@ -4,12 +4,12 @@
        <title>IT Mill Toolkit 5 Demo: Reservr</title>\r
        <script type="text/javascript">\r
                var itmtk = {\r
-                       appUri:'/toolkit/Reservr', pathInfo: '/'\r
+                       appUri:'Reservr', pathInfo: '/'\r
                };\r
        </script>\r
        <script src="http://maps.google.com/maps?file=api&amp;v=2" type="text/javascript"></script>\r
        <script language='javascript' src='ITK-INF/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet/com.itmill.toolkit.demo.reservation.gwt.WidgetSet.nocache.js'></script>\r
-       <link REL="stylesheet" TYPE="text/css" HREF="/toolkit/ITK-INF/themes/reservr/styles.css">\r
+       <link REL="stylesheet" TYPE="text/css" HREF="ITK-INF/themes/reservr/styles.css">\r
 </head>\r
 <body>\r
        <iframe id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>\r
index c5f63ac33a6ba4f93403b35900f0779e489ab5f1..0d6ab623136ad07ef6cad0c449d2217aeceab8c2 100755 (executable)
@@ -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()/*-{