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/28 02:26:03 UTC

svn commit: r990308 - in /wicket/branches/wicket-1.4.x/wicket/src: main/java/org/apache/wicket/ test/java/org/apache/wicket/ test/java/org/apache/wicket/ajax/ test/java/org/apache/wicket/ajax/form/ test/java/org/apache/wicket/ajax/markup/html/ajaxLink/...

Author: ivaynberg
Date: Sat Aug 28 00:26:02 2010
New Revision: 990308

URL: http://svn.apache.org/viewvc?rev=990308&view=rev
Log:

Issue: WICKET-2783

Modified:
    wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java
    wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/MarkupContainer.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/Component.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java?rev=990308&r1=990307&r2=990308&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/Component.java Sat Aug 28 00:26:02 2010
@@ -1066,7 +1066,7 @@ public abstract class Component implemen
 
 			// clear the enabled in hierarchy cache as it may change as a result of form processing
 			// or other logic executed in onbeforerender (WICKET-2063)
-			setMetaData(Component.ENABLED_IN_HIERARCHY_CACHE_KEY, null);
+			clearEnabledInHierarchyCache();
 
 			onBeforeRender();
 			getApplication().notifyPostComponentOnBeforeRenderListeners(this);
@@ -1252,7 +1252,7 @@ public abstract class Component implemen
 		}
 
 		// clear out enabled state metadata
-		setMetaData(ENABLED_IN_HIERARCHY_CACHE_KEY, null);
+		clearEnabledInHierarchyCache();
 
 		// notify any detach listener
 		IDetachListener detachListener = getApplication().getFrameworkSettings()
@@ -2885,10 +2885,21 @@ public abstract class Component implemen
 
 			// Change visibility
 			setFlag(FLAG_ENABLED, enabled);
+			onEnabledStateChanged();
 		}
 		return this;
 	}
 
+	void clearEnabledInHierarchyCache()
+	{
+		setMetaData(ENABLED_IN_HIERARCHY_CACHE_KEY, null);
+	}
+
+	void onEnabledStateChanged()
+	{
+		clearEnabledInHierarchyCache();
+	}
+
 	/**
 	 * Sets whether model strings should be escaped.
 	 * 

Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=990308&r1=990307&r2=990308&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Sat Aug 28 00:26:02 2010
@@ -402,8 +402,8 @@ public abstract class MarkupContainer ex
 	}
 
 	/**
-	 * Overrides {@link Component#initialize()} to call {@link Component#fireInitialize()} for itself
-	 * and for all its children.
+	 * Overrides {@link Component#initialize()} to call {@link Component#fireInitialize()} for
+	 * itself and for all its children.
 	 * 
 	 * @see org.apache.wicket.Component#fireInitialize()
 	 */
@@ -1768,6 +1768,21 @@ public abstract class MarkupContainer ex
 		}
 	}
 
+	@Override
+	void onEnabledStateChanged()
+	{
+		super.onEnabledStateChanged();
+		visitChildren(new IVisitor<Component>()
+		{
+
+			public Object component(Component component)
+			{
+				component.clearEnabledInHierarchyCache();
+				return CONTINUE_TRAVERSAL;
+			}
+		});
+	}
+
 	/**
 	 * 
 	 * @see org.apache.wicket.Component#onAfterRenderChildren()

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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 2010
@@ -1,8 +1,8 @@
-<?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>
+<?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>
 <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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 Wicket.Event.add(window, "domready", function(event) { domReady();;});
-/*-->]]>*/</script>
+</script>
 
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 Wicket.Event.add(window, "load", function(event) { onLoad();;});
-/*-->]]>*/</script>
+</script>
 
 
 <link href="../test2"/>
 <script type="text/javascript" src="javascripturlB"></script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 Wicket.Event.add(window, "domready", function(event) { domReadyB();;});
-/*-->]]>*/</script>
+</script>
 
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 Wicket.Event.add(window, "domready", function(event) { domReady();;});
-/*-->]]>*/</script>
+</script>
 
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 2010
@@ -1,8 +1,8 @@
-<?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>
+<?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>
 <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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
+</script>
 
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 Wicket.Event.add(window, "domready", function(event) { test1();;});
-/*-->]]>*/</script>
+</script>
 
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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"><!--/*--><![CDATA[/*><!--*/
+			<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">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 2010
@@ -1,8 +1,8 @@
-<?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>
+<?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>
 <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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
+</script>
 
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 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=990308&r1=990307&r2=990308&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 Sat Aug 28 00:26:02 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"><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" id="wicket-ajax-debug-enable">
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
+</script>
 
 </head><body>