fixes #468

svn changeset:798/svn branch:trunk

diff --git a/WebContent/index.html b/WebContent/index.html
index 8f9b648801bbe3586be7565a4260497272854b6b..971990a86a638ee1fda428459368c2304840afb0 100644 (file)
--- 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 abf99f5cca949bacc9728a728a9d3f57049c5bc2..f8413a0fdd5438fb9ac9bb32e8b061937161dcb2 100644 (file)
--- 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);
                                        }
                                }