You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/05/31 11:40:11 UTC
svn commit: r543100 - in
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http:
request/WebRequestCodingStrategy.java servlet/ServletWebRequest.java
Author: almaw
Date: Thu May 31 02:40:10 2007
New Revision: 543100
URL: http://svn.apache.org/viewvc?view=rev&rev=543100
Log:
Fix paths in RelativePathPrefix prepended hrefs for AJAX requests.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?view=diff&rev=543100&r1=543099&r2=543100
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Thu May 31 02:40:10 2007
@@ -40,7 +40,6 @@
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.UnitTestSettings;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.request.IRequestCodingStrategy;
import org.apache.wicket.request.IRequestTargetMountsInfo;
import org.apache.wicket.request.RequestParameters;
@@ -262,22 +261,9 @@
// Servlet/Filter, with no leading '/'.
PrependingStringBuffer prepender = new PrependingStringBuffer(url.toString());
- // For AJAX requests, we need to make the URLs relative to the
- // original page.
- if (requestCycle.getRequest() instanceof WebRequest
- && ((WebRequest)requestCycle.getRequest()).isAjax())
- {
- for (int i = 0; i < requestCycle.getRequest().getRequestParameters().getUrlDepth(); i++)
- {
- prepender.prepend("../");
- }
- }
- else
- {
- // Prepend prefix to the URL to make it relative to the current
- // request.
- prepender.prepend(requestCycle.getRequest().getRelativePathPrefixToWicketHandler());
- }
+ // Prepend prefix to the URL to make it relative to the current
+ // request.
+ prepender.prepend(requestCycle.getRequest().getRelativePathPrefixToWicketHandler());
String result = prepender.toString();
// We need to special-case links to the home page if we're at the
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?view=diff&rev=543100&r1=543099&r2=543100
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Thu May 31 02:40:10 2007
@@ -216,8 +216,21 @@
{
return relativePathPrefixToWicketHandler;
}
- String relativeUrl = getPath();
+
PrependingStringBuffer prepender = new PrependingStringBuffer();
+
+ // For AJAX requests, we need to make the URLs relative to the
+ // original page.
+ if (isAjax())
+ {
+ for (int i = 0; i < getRequestParameters().getUrlDepth(); i++)
+ {
+ prepender.prepend("../");
+ }
+ return relativePathPrefixToWicketHandler = prepender.toString();
+ }
+
+ String relativeUrl = getPath();
/*
* We might be serving an error page.
@@ -264,7 +277,7 @@
prepender.prepend("../");
}
}
- return prepender.toString();
+ return relativePathPrefixToWicketHandler = prepender.toString();
}
if (forwardUrl != null)