diff options
| author | Henri Sara <henri.sara@itmill.com> | 2009-07-07 07:22:16 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2009-07-07 07:22:16 +0000 |
| commit | 3ef5f2f982519ba6b966bf4c256f4c81331a8cfa (patch) | |
| tree | 0af51b9d073cd0623fea8a1c11f57c1a61ba167b /src | |
| parent | 77fe9b2fbf959f18434aa047eecb78a8782694cd (diff) | |
| download | vaadin-framework-3ef5f2f982519ba6b966bf4c256f4c81331a8cfa.tar.gz vaadin-framework-3ef5f2f982519ba6b966bf4c256f4c81331a8cfa.zip | |
#3113 Fix theme URI for client
svn changeset:8339/svn branch:6.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 8 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index b661dc761c..a889f415e8 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1371,9 +1371,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { page.write("windowName: '" + window.getName() + "', "); } page.write("themeUri:"); - page - .write(themeBaseUri != null ? "'" + themeBaseUri + "'" - : "null"); + page.write(themeUri != null ? "'" + themeUri + "'" : "null"); page.write(", versionInfo : {vaadinVersion:\""); page.write(VERSION); page.write("\",applicationVersion:\""); @@ -1446,9 +1444,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { page.write("windowName: '" + window.getName() + "', "); } page.write("themeUri:"); - page - .write(themeBaseUri != null ? "'" + themeBaseUri + "'" - : "null"); + page.write(themeUri != null ? "'" + themeUri + "'" : "null"); page.write(", versionInfo : {vaadinVersion:\""); page.write(VERSION); page.write("\",applicationVersion:\""); diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java index 7c1b29d05c..66b08f26a3 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java @@ -140,7 +140,7 @@ public class ApplicationPortlet implements Portlet, Serializable { + portalTheme;
request.setAttribute(
ApplicationServlet.REQUEST_DEFAULT_THEME_URI,
- themeUri);
+ portalTheme);
}
dispatcher.include(request, response);
|