From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 6 Mar 2007 13:01:24 +0000 (+0000)
Subject: fixes #468
X-Git-Tag: 6.7.0.beta1~6549
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74d4aa7ed1fadb0703951ebc9fa5a26faa89b85c;p=vaadin-framework.git

fixes #468

svn changeset:798/svn branch:trunk
---

diff --git a/WebContent/index.html b/WebContent/index.html
index 8f9b648801..971990a86a 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -16,7 +16,7 @@
   <div id="feature-browser">
 	<h3>Feature Browser</h3>
 	<div class="option">
-	 <span class="link"><a href="features/">Autodetected mode</a></span>
+	 <span class="link"><a href="features/?renderingMode=detect">Autodetected mode</a></span>
 	 <span class="desc">Use AJAX if supported by browser, otherwise fallback to HTML mode</span>
 	</div>
 	
@@ -38,7 +38,7 @@
 	<h4>Hello World</h4>
 	
 	<div class="option">
-	 <span class="link"><a href="hello/">Autodetected mode</a></span>
+	 <span class="link"><a href="hello/?renderingMode=detect">Autodetected mode</a></span>
 	 <span class="desc">Use AJAX if supported by browser, otherwise fallback to HTML mode</span>
 	</div>
 	
@@ -50,7 +50,7 @@
 	<h4>Calculator</h4>
 	
 	<div class="option">
-	 <span class="link"><a href="calc/">Autodetected mode</a></span>
+	 <span class="link"><a href="calc/?renderingMode=detect">Autodetected mode</a></span>
 	 <span class="desc">Use AJAX if supported by browser, otherwise fallback to HTMLmode</span>
 	</div>
 	
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index abf99f5cca..f8413a0fdd 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -563,10 +563,12 @@ public class ApplicationServlet extends HttpServlet implements
 				WebBrowserProbe
 						.handleProbeRequest(request, unhandledParameters);
 
-				// If rendering mode is not defined try to detect it
+				// If rendering mode is not defined or detecting requested
+				// try to detect it
 				WebBrowser wb = WebBrowserProbe.getTerminalType(request
 						.getSession());
-				if (wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) {
+				if (unhandledParameters.get("renderingMode").equals("detect") 
+						|| wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) {
 					String themeName = application.getTheme();
 					if (themeName == null)
 						themeName = DEFAULT_THEME;
@@ -589,7 +591,7 @@ public class ApplicationServlet extends HttpServlet implements
 							.get("renderingMode"))[0];
 					if (renderingMode.equals("html")) {
 						wb.setRenderingMode(WebBrowser.RENDERING_MODE_HTML);
-					} else {
+					} else if(renderingMode.equals("ajax")){
 						wb.setRenderingMode(WebBrowser.RENDERING_MODE_AJAX);
 					}
 				}