svn commit: r997520 - in /wicket/trunk: wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

[pete]

Author: pete
Date: Wed Sep 15 21:49:42 2010
New Revision: 997520

URL: http://svn.apache.org/viewvc?rev=997520&view=rev
Log:
fix handling for ajax request header and ajax request parameter to detect ajax

Modified:
    
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

Modified: 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java?rev=997520&r1=997519&r2=997520&view=diff
==============================================================================
--- 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
 (original)
+++ 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
 Wed Sep 15 21:49:42 2010
@@ -115,8 +115,8 @@ public abstract class WebRequest extends
         */
        public boolean isAjax()
        {
-               return (Strings.isEmpty(getHeader(HEADER_AJAX)) == false) ||
-                       
getRequestParameters().getParameterValue(PARAM_AJAX).toBoolean(false);
+               return Strings.isTrue(getHeader(HEADER_AJAX)) ||
+                       
Strings.isTrue(getRequestParameters().getParameterValue(PARAM_AJAX).toString());
        }
 
        /**

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=997520&r1=997519&r2=997520&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
 Wed Sep 15 21:49:42 2010
@@ -741,7 +741,7 @@ public class BaseWicketTester
                transform(url);
                request.setUrl(url);
                request.addHeader("Wicket-Ajax-BaseURL", url.toString());
-               request.addHeader("Wicket-Ajax", "Wicket-Ajax");
+               request.addHeader("Wicket-Ajax", "true");
                processRequest();
        }
 
@@ -768,7 +768,7 @@ public class BaseWicketTester
                transform(url);
                request.setUrl(url);
                request.addHeader("Wicket-Ajax-BaseURL", url.toString());
-               request.addHeader("Wicket-Ajax", "Wicket-Ajax");
+               request.addHeader("Wicket-Ajax", "true");
                processRequest();
        }
 
@@ -1660,7 +1660,7 @@ public class BaseWicketTester
                        Charset.forName(request.getCharacterEncoding()));
                transform(url);
                request.addHeader("Wicket-Ajax-BaseURL", url.toString());
-               request.addHeader("Wicket-Ajax", "Wicket-Ajax");
+               request.addHeader("Wicket-Ajax", "true");
                request.setUrl(url);
                processRequest(request, null);
        }