Outputs themeUri:null, not themeUri:'null', if theme is not set. (real null, not...

svn changeset:3087/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 9b7595d18ef75139226b561facbee7cdb59f3596..529d1f4229ab310c87755b230a58d1e640b3fd97 100644 (file)
--- 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