You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/29 09:09:57 UTC
svn commit: r990501 - in /wicket/branches/wicket-1.4.x/wicket/src:
main/java/org/apache/wicket/request/target/coding/
test/java/org/apache/wicket/ test/java/org/apache/wicket/ajax/
test/java/org/apache/wicket/ajax/form/ test/java/org/apache/wicket/ajax...
Author: ivaynberg
Date: Sun Aug 29 07:09:57 2010
New Revision: 990501
URL: http://svn.apache.org/viewvc?rev=990501&view=rev
Log:
Issue: WICKET-2275
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java Sun Aug 29 07:09:57 2010
@@ -97,12 +97,13 @@ public abstract class AbstractRequestTar
String[] values = (String[])value;
for (String value1 : values)
{
- appendValue(url, ((Entry<?, ?>)entry1).getKey().toString(), value1);
+ appendPathParameter(url, ((Entry<?, ?>)entry1).getKey().toString(),
+ value1);
}
}
else
{
- appendValue(url, ((Entry<?, ?>)entry1).getKey().toString(),
+ appendPathParameter(url, ((Entry<?, ?>)entry1).getKey().toString(),
value.toString());
}
}
@@ -110,7 +111,14 @@ public abstract class AbstractRequestTar
}
}
- private void appendValue(AppendingStringBuffer url, String key, String value)
+ /**
+ * Appends path parameter
+ *
+ * @param url
+ * @param key
+ * @param value
+ */
+ protected void appendPathParameter(AppendingStringBuffer url, String key, String value)
{
String escapedValue = urlEncodePathComponent(value);
if (!Strings.isEmpty(escapedValue))
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java Sun Aug 29 07:09:57 2010
@@ -26,6 +26,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Session;
+import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy;
@@ -440,6 +441,72 @@ public class HybridUrlCodingStrategy ext
return addPageInfo(url.toString(), pageInfo);
}
+ private static final String ESCAPE = "----------------------------------------";
+ private static final int MAX_ESCAPE = 20;
+
+ @Override
+ protected String urlEncodePathComponent(String string)
+ {
+ String component = super.urlEncodePathComponent(string);
+ if (component != null && component.contains("."))
+ {
+ component = encodeDot(component);
+ }
+ return component;
+ }
+
+ private String encodeDot(String component)
+ {
+ int smallest = -1;
+ for (int i = MAX_ESCAPE; i > 0; i--)
+ {
+ String seq = createEscapeSequence(i);
+ if (component.contains(seq))
+ {
+ break;
+ }
+ smallest = i;
+ }
+ if (smallest == -1)
+ {
+ throw new WicketRuntimeException("Could not encode a dot for hybrid url part: " +
+ component);
+ }
+ String seq = createEscapeSequence(smallest);
+ component = component.replace(".", seq);
+ return component;
+ }
+
+ private static String createEscapeSequence(int i)
+ {
+ return "_" + ESCAPE.substring(0, i) + "_";
+ }
+
+ @Override
+ protected String urlDecodePathComponent(String value)
+ {
+ String component = super.urlDecodePathComponent(value);
+ if (component != null && component.contains("_-"))
+ {
+ component = decodeDot(component);
+ }
+ return component;
+ }
+
+ private String decodeDot(String component)
+ {
+ for (int i = MAX_ESCAPE; i > 0; i--)
+ {
+ String seq = createEscapeSequence(i);
+ if (component.contains(seq))
+ {
+ component = component.replace(seq, ".");
+ break;
+ }
+ }
+ return component;
+ }
+
/**
* @see org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy#matches(org.apache.wicket.IRequestTarget)
*/
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html Sun Aug 29 07:09:57 2010
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]^]^>*/</script>
</head>]]></header-contribution><component id="comp1" ><![CDATA[<span id="comp1" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:-1',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('comp1') != null;}.bind(this));">body</span>]]></component></ajax-response>
\ No newline at end of file
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<span wicket:id="comp" id="comp1" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('comp1') != null;}.bind(this));">body</span>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html Sun Aug 29 07:09:57 2010
@@ -3,30 +3,30 @@
<link href="../test"/>
<script type="text/javascript" src="javascripturl"></script>
<script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "domready", function(event) { domReady();;});
-</script>
+/*-->]]>*/</script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "load", function(event) { onLoad();;});
-</script>
+/*-->]]>*/</script>
<link href="../test2"/>
<script type="text/javascript" src="javascripturlB"></script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "domready", function(event) { domReadyB();;});
-</script>
+/*-->]]>*/</script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "load", function(event) { onLoadB();;});
-</script>
+/*-->]]>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<span wicket:id="test1" id="test11"><wicket:panel>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html Sun Aug 29 07:09:57 2010
@@ -3,19 +3,19 @@
<link href="../test"/>
<script type="text/javascript" src="javascripturl"></script>
<script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "domready", function(event) { domReady();;});
-</script>
+/*-->]]>*/</script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "load", function(event) { onLoad();;});
-</script>
+/*-->]]>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<span wicket:id="test1" id="test11"><wicket:panel>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html Sun Aug 29 07:09:57 2010
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]^]^>*/</script>
</head>]]></header-contribution><component id="test1" ><![CDATA[<a href="?wicket:interface=:0:test::ILinkListener::" id="test1" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:-1',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('test1') != null;}.bind(this));return !wcall;">Test</a>]]></component><evaluate><![CDATA[test1();]]></evaluate><evaluate><![CDATA[test2();]]></evaluate></ajax-response>
\ No newline at end of file
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html Sun Aug 29 07:09:57 2010
@@ -2,17 +2,17 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "domready", function(event) { test1();;});
-</script>
+/*-->]]>*/</script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "domready", function(event) { test2();;});
-</script>
+/*-->]]>*/</script>
</head><body>
<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test" id="test1" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('test1') != null;}.bind(this));return !wcall;">Test</a>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<form wicket:id="form" id="form1" method="post" action="?wicket:interface=:0:form::IFormSubmitListener::"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html Sun Aug 29 07:09:57 2010
@@ -2,15 +2,15 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<form wicket:id="form" id="form1" method="post" action="?wicket:interface=:0:form::IFormSubmitListener::"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <input type="text" wicket:id="field" value="" name="field" id="field2" onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:field::IBehaviorListener:0:', wicketSerialize(Wicket.$('field2')),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('field2') != null;}.bind(this));"/><script type="text/javascript">
+ <input type="text" wicket:id="field" value="" name="field" id="field2" onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:field::IBehaviorListener:0:', wicketSerialize(Wicket.$('field2')),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('field2') != null;}.bind(this));"/><script type="text/javascript"><!--/*--><![CDATA[/*><!--*/
new Wicket.ChangeHandler('field2');
-</script>
+/*-->]]>*/</script>
<select wicket:id="dropDown" name="dropDown" id="dropDown3" onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:dropDown::IBehaviorListener:0:', wicketSerialize(Wicket.$('dropDown3')),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('dropDown3') != null;}.bind(this));">
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<span wicket:id="ajaxLabel" id="ajaxLabel1">UpdateMe</span>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<span wicket:id="border"><wicket:border>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<span wicket:id="pageLayout"><wicket:border>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html Sun Aug 29 07:09:57 2010
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]^]^>*/</script>
</head>]]></header-contribution><component id="linja11" ><![CDATA[<span id="linja11">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IActivePageBehaviorListener:0:-1&wicket:ignoreIfNotActive=true',function() { }.bind(this),function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null}.bind(this));", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html Sun Aug 29 07:09:57 2010
@@ -4,13 +4,13 @@
<script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
-<script type="text/javascript" >
+<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
Wicket.Event.add(window, "load", function(event) { setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true',function() { }.bind(this),function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null}.bind(this));", 2000);;});
-</script>
+/*-->]]>*/</script>
</head>
<body>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html Sun Aug 29 07:09:57 2010
@@ -6,9 +6,9 @@
<script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
</body>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
<div wicket:id="hideable"><wicket:border>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html?rev=990501&r1=990500&r2=990501&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html Sun Aug 29 07:09:57 2010
@@ -2,9 +2,9 @@
<head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<script type="text/javascript" id="wicket-ajax-debug-enable">
+<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
-</script>
+/*-->]]>*/</script>
</head><body>