]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed #1056 Browser tries to download non-existent resource when default theme in...
authorJani Laakso <jani.laakso@itmill.com>
Fri, 2 Nov 2007 10:41:36 +0000 (10:41 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Fri, 2 Nov 2007 10:41:36 +0000 (10:41 +0000)
svn changeset:2676/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java

index 3ce669becfb38cc1cdb52757cc6b00e566566d41..9f574f8771c10f154349152fb327a9eb38f1f196 100644 (file)
@@ -500,29 +500,20 @@ public class ApplicationServlet extends HttpServlet {
                if (widgetset == null) {
                        widgetset = DEFAULT_WIDGETSET;
                }
-               
-               if (themeName == null) themeName = "default";
 
+               if (themeName == null)
+                       themeName = "default";
+
+               page.write("', pathInfo: '" + pathInfo + "'\n};\n" + "</script>\n"
+                               + "<script language='javascript' src='" + appUrl + "/"
+                               + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset
+                               + ".nocache.js'></script>\n");
+               if (!themeName.equals("default"))
+                       page.write("<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""
+                                       + appUrl + "/" // TODO relative url as above?
+                                       + THEME_DIRECTORY_PATH + themeName + "/styles.css\">\n");
                page
-                               .write("', pathInfo: '"
-                                               + pathInfo
-                                               + "'\n};\n"
-                                               + "</script>\n"
-                                               + "<script language='javascript' src='"
-                                               + appUrl
-                                               + "/"
-                                               + WIDGETSET_DIRECTORY_PATH
-                                               + widgetset
-                                               + "/"
-                                               + widgetset
-                                               + ".nocache.js'></script>\n"
-                                               + "<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""
-                                               + appUrl
-                                               + "/" // TODO relative url as above?
-                                               + THEME_DIRECTORY_PATH
-                                               + themeName
-                                               + "/styles.css\">\n"
-                                               + "</head>\n<body style=\"width:100%;height:100%;border:0;margin:0\">\n"
+                               .write("</head>\n<body style=\"width:100%;height:100%;border:0;margin:0\">\n"
                                                + "     <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0;overflow:hidden\"></iframe>\n"
                                                + "     <div id=\"itmill-ajax-window\" style=\"position: absolute;top:0;left:0;width:100%;height:100%;border:0;margin:0\"></div>"
                                                + "     </body>\n" + "</html>\n");