diff options
| author | Marc Englund <marc.englund@itmill.com> | 2007-11-30 15:05:48 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2007-11-30 15:05:48 +0000 |
| commit | 15a1d94f6ae5caac76ca9fc60d6ba99f6dd5723c (patch) | |
| tree | 0f1379312b2a638afcb8f997c183b876dd9cfb17 /src/com | |
| parent | 91d3351929f6c161de9c0c7830d98648309dda64 (diff) | |
| download | vaadin-framework-15a1d94f6ae5caac76ca9fc60d6ba99f6dd5723c.tar.gz vaadin-framework-15a1d94f6ae5caac76ca9fc60d6ba99f6dd5723c.zip | |
Outputs themeUri:null, not themeUri:'null', if theme is not set. (real null, not the string "null")
svn changeset:3087/svn branch:trunk
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 9b7595d18e..529d1f4229 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -526,11 +526,11 @@ public class ApplicationServlet extends HttpServlet { // Using custom theme themeUri = staticFilePath + "/" + THEME_DIRECTORY_PATH + themeName; } - page.write("', pathInfo: '" + pathInfo + "', themeUri: '" + themeUri - + "'\n};\n" + "</script>\n" - + "<script language='javascript' src='" + staticFilePath + "/" - + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset - + ".nocache.js'></script>\n"); + page.write("', pathInfo: '" + pathInfo + "', themeUri: " + + (themeUri != null ? "'" + themeUri + "'" : "null") + "\n};\n" + + "</script>\n" + "<script language='javascript' src='" + + staticFilePath + "/" + WIDGETSET_DIRECTORY_PATH + widgetset + + "/" + widgetset + ".nocache.js'></script>\n"); if (themeName != null) { // Custom theme's stylesheet |