diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-02-09 08:53:50 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-02-09 08:53:50 +0000 |
| commit | 33a0247affb8cf27ed991deae886d008ea2dfaf3 (patch) | |
| tree | e357059acf5b21b037dc5acc7c9276b6ade850e6 /src | |
| parent | 3c0d1c8bc5d6c9a0da1ef06a5a62d621b18f0e52 (diff) | |
| download | vaadin-framework-33a0247affb8cf27ed991deae886d008ea2dfaf3.tar.gz vaadin-framework-33a0247affb8cf27ed991deae886d008ea2dfaf3.zip | |
#6336 IE8 in compatibility mode does not work
Added HttpServletRequest to writeAjaxPageHtmlMainDiv also for consistency
svn changeset:17239/svn branch:6.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index c1df8cb40d..5f06285b1f 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1564,14 +1564,14 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * If one needs to override parts of the host page, it is suggested that one * overrides on of several submethods which are called by this method: * <ul> - * <li> {@link #setAjaxPageHeaders(HttpServletResponse)} - * <li> {@link #writeAjaxPageHtmlHeadStart(BufferedWriter)} - * <li> {@link #writeAjaxPageHtmlHeader(BufferedWriter, String, String)} - * <li> {@link #writeAjaxPageHtmlBodyStart(BufferedWriter)} + * <li> {@link #setAjaxPageHeaders(HttpServletResponse) + * <li> {@link #writeAjaxPageHtmlHeadStart(BufferedWriter, HttpServletRequest) + * <li> {@link #writeAjaxPageHtmlHeader(BufferedWriter, String, String, HttpServletRequest) + * <li> {@link #writeAjaxPageHtmlBodyStart(BufferedWriter, HttpServletRequest) * <li> - * {@link #writeAjaxPageHtmlVaadinScripts(Window, String, Application, BufferedWriter, String, String, String, String, String, String)} + * {@link #writeAjaxPageHtmlVaadinScripts(Window, String, Application, BufferedWriter, String, String, String, HttpServletRequest) * <li> - * {@link #writeAjaxPageHtmlMainDiv(BufferedWriter, String, String, String)} + * {@link #writeAjaxPageHtmlMainDiv(BufferedWriter, String, String, String, HttpServletRequest) * <li> {@link #writeAjaxPageHtmlBodyEnd(BufferedWriter)} * </ul> * @@ -1669,7 +1669,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements + "\""; } - writeAjaxPageHtmlMainDiv(page, appId, classNames, divStyle); + writeAjaxPageHtmlMainDiv(page, appId, classNames, divStyle, request); if (!fragment) { page.write("</body>\n</html>\n"); @@ -1737,10 +1737,11 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * @param appId * @param classNames * @param divStyle + * @param request * @throws IOException */ protected void writeAjaxPageHtmlMainDiv(final BufferedWriter page, - String appId, String classNames, String divStyle) + String appId, String classNames, String divStyle, HttpServletRequest request) throws IOException { page.write("<div id=\"" + appId + "\" class=\"" + classNames + "\" " + (divStyle != null ? divStyle : "") + "></div>\n"); |