summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>2007-01-02 13:59:16 +0000
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>2007-01-02 13:59:16 +0000
commitdada43b397fdea4d7e6f770ca1131daef18159d5 (patch)
tree201412b811ab34c51117f2b877c62cdd617887ab /src/com
parenta9a3e978445bf94e2b5efa861bb50dedfb281624 (diff)
downloadvaadin-framework-dada43b397fdea4d7e6f770ca1131daef18159d5.tar.gz
vaadin-framework-dada43b397fdea4d7e6f770ca1131daef18159d5.zip
bugfix in forcing to non-debug mode
svn changeset:204/svn branch:toolkit
Diffstat (limited to 'src/com')
-rw-r--r--src/com/itmill/toolkit/terminal/web/ApplicationServlet.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index aa0770163e..cd4e302626 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -745,7 +745,8 @@ public class ApplicationServlet extends HttpServlet implements
}
// If other than XSLT or UIDL mode is requested
- if (!Theme.MODE_XSLT.equals(renderingMode) && !(window instanceof DebugWindow)) {
+ if (!Theme.MODE_XSLT.equals(renderingMode)
+ && !(window instanceof DebugWindow)) {
// TODO More informal message should be given is browser
// is not supported
response.setContentType("text/html");
@@ -1492,8 +1493,8 @@ public class ApplicationServlet extends HttpServlet implements
}
} else if (window != debugWindow) {
if (isDebugMode(params))
- debugWindow.requestRepaint();
- else
+ debugWindow.requestRepaint();
+ else
application.removeWindow(debugWindow);
}
@@ -1525,7 +1526,8 @@ public class ApplicationServlet extends HttpServlet implements
public boolean isDebugMode(Map parameters) {
if (parameters != null) {
Object[] debug = (Object[]) parameters.get("debug");
- if (debug != null && !"false".equals(debug[0].toString()))
+ if (debug != null && !"false".equals(debug[0].toString())
+ && !"false".equals(debugMode))
return true;
}
return "true".equals(debugMode);