You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/04/06 20:37:50 UTC

svn commit: r1089558 - in /wicket/trunk: wicket-core/src/main/java/org/apache/wicket/util/string/ wicket-core/src/test/java/org/apache/wicket/ wicket-core/src/test/java/org/apache/wicket/ajax/ wicket-core/src/test/java/org/apache/wicket/ajax/form/ wick...

Author: mgrigorov
Date: Wed Apr  6 18:37:49 2011
New Revision: 1089558

URL: http://svn.apache.org/viewvc?rev=1089558&view=rev
Log:
WICKET-3597 Wicket 1.5 RC-3 Bug with conditional comments

Wrap <style> and <script> content with /*<![CDATA[*/ ... /*]]>*/ as suggested at https://developer.mozilla.org/en/Writing_JavaScript_for_XHTML


Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
    wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptUtils.java Wed Apr  6 18:37:49 2011
@@ -27,22 +27,22 @@ import org.apache.wicket.request.Respons
 public class JavaScriptUtils
 {
 	/** Script open tag */
-	public final static String SCRIPT_OPEN_TAG = "<script type=\"text/javascript\"><!--/*--><![CDATA[/*><!--*/\n";
+	public final static String SCRIPT_OPEN_TAG = "<script type=\"text/javascript\">\n/*<![CDATA[*/\n";
 
 	/** Script close tag */
-	public final static String SCRIPT_CLOSE_TAG = "\n/*-->]]>*/</script>\n";
+	public final static String SCRIPT_CLOSE_TAG = "\n/*]]>*/\n</script>\n";
 
 	/**
 	 * Script open tag. If this tag is changed, also update Wicket.Head.Contributor.processScript()
 	 * function from wicket-ajax.js
 	 */
-	public final static String SCRIPT_CONTENT_PREFIX = "<!--/*--><![CDATA[/*><!--*/\n";
+	public final static String SCRIPT_CONTENT_PREFIX = "\n/*<![CDATA[*/\n";
 
 	/**
 	 * Script close tag. If this tag is changed, also update Wicket.Head.Contributor.processScript()
 	 * function from wicket-ajax.js
 	 */
-	public final static String SCRIPT_CONTENT_SUFFIX = "\n/*-->]]>*/";
+	public final static String SCRIPT_CONTENT_SUFFIX = "\n/*]]>*/\n";
 
 
 	/** The response object */

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html Wed Apr  6 18:37:49 2011
@@ -1,10 +1,14 @@
 <?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="./resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="./resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="./resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]^]^>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]^]^>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-comp";
-/*-->]^]^>*/</script>
+/*]^]^>*/
+</script>
 </head>]]></header-contribution><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1" onclick="var wcall=wicketAjaxGet(&#039;./page?0-1.IBehaviorListener.0-comp&#039;,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;comp1&#039;) != null;}.bind(this));">body</span>]]></component></ajax-response>
\ No newline at end of file

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
   <span wicket:id="comp" id="comp1" onclick="var wcall=wicketAjaxGet(&#039;../page?0-1.IBehaviorListener.0-comp&#039;,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;comp1&#039;) != null;}.bind(this));">body</span>
 </body>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html Wed Apr  6 18:37:49 2011
@@ -3,29 +3,41 @@
 <link href="../../test"/>
 <script type="text/javascript" src="../../javascripturl"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { domReady();;});
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<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" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { domReadyB();;});
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { onLoadB();;});
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage2?0";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 <span wicket:id="test1" id="test11"><wicket:panel>
 test

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html Wed Apr  6 18:37:49 2011
@@ -3,20 +3,28 @@
 <link href="../../test"/>
 <script type="text/javascript" src="../../javascripturl"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { domReady();;});
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { onLoad();;});
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage?0";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 <span wicket:id="test1" id="test11"><wicket:panel>
 test

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html Wed Apr  6 18:37:49 2011
@@ -1,10 +1,14 @@
 <?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="./resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="./resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="./resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]^]^>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]^]^>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-test";
-/*-->]^]^>*/</script>
+/*]^]^>*/
+</script>
 </head>]]></header-contribution><component id="test1" ><![CDATA[<a href="./page?0-1.ILinkListener-test" wicket:id="test" id="test1" onclick="var wcall=wicketAjaxGet(&#039;./page?0-1.IBehaviorListener.0-test&#039;,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;test1&#039;) != 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/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html Wed Apr  6 18:37:49 2011
@@ -2,18 +2,26 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0";
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { test1();;});
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { test2();;});
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 <a href="../page?0-1.ILinkListener-test" wicket:id="test" id="test1" onclick="var wcall=wicketAjaxGet(&#039;../page?0-1.IBehaviorListener.0-test&#039;,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;test1&#039;) != null;}.bind(this));return !wcall;">Test</a>
 </body>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html Wed Apr  6 18:37:49 2011
@@ -1,5 +1,6 @@
 <![CDATA[<head xmlns:wicket="http://wicket.apache.org">
-<style type="text/css" id="org-apache-wicket-ajax-MockComponent1-0"><!--/*--><![CDATA[/*><!--*/
+<style type="text/css" id="org-apache-wicket-ajax-MockComponent1-0">
+/*<![CDATA[*/
 
 .onTheFlyClass {
 	background-color: red;
@@ -7,5 +8,6 @@
 	width: 200px;
 }
 
-/*-->]^]^>*/</style>
+/*]^]^>*/
+</style>
 </head>]]>
\ No newline at end of file

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 	<head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 		<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><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="txt1" value="foo" name="txt1"/>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html Wed Apr  6 18:37:49 2011
@@ -2,15 +2,21 @@
 	<head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0";
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { new Wicket.ChangeHandler('field1');;});
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 		<form wicket:id="form" id="form2" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form2_hf_0" id="form2_hf_0" /></div>
 			<input type="text" wicket:id="field" value="" name="field" id="field1" onchange="var wcall=wicketAjaxPost(&#039;../page?0-1.IBehaviorListener.0-form-field&#039;, wicketSerialize(Wicket.$(&#039;field1&#039;)),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;field1&#039;) != null;}.bind(this));"/>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
   <span wicket:id="ajaxLabel" id="ajaxLabel1">UpdateMe</span>
   <a href="#" wicket:id="ajaxLink" id="ajaxLink2" onclick="var wcall=wicketAjaxGet(&#039;../page?0-1.IBehaviorListener.0-ajaxLink&#039;,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;ajaxLink2&#039;) != null;}.bind(this));return !wcall;">Update</a>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
   <span wicket:id="border"><wicket:border>
     Border

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
   <span wicket:id="pageLayout"><wicket:border>
         <table width = "0%" border = "0" cellspacing = "0" cellpadding = "1" bgcolor = "black">

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html Wed Apr  6 18:37:49 2011
@@ -1,10 +1,14 @@
 <?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="./resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="./resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="./resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]^]^>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]^]^>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1";
-/*-->]^]^>*/</script>
+/*]^]^>*/
+</script>
 </head>]]></header-contribution><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('./page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1',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/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -4,15 +4,21 @@
 <script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0";
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { setTimeout("var wcall=wicketAjaxGet('../page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1',function() { }.bind(this),function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null}.bind(this));", 2000);;});
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head>
 <body>
   <span wicket:id="testPanel"><wicket:panel>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java Wed Apr  6 18:37:49 2011
@@ -389,8 +389,7 @@ public final class MarkupParserTest exte
 		assertEquals(5, markup.size());
 		assertEquals("html", ((ComponentTag)markup.get(0)).getName());
 		assertEquals("html", ((ComponentTag)markup.get(4)).getName());
-		assertEquals("<!--/*--><![CDATA[/*><!--*/\n... <x a> ...\n/*-->]]>*/", markup.get(2)
-			.toString());
+		assertEquals("\n/*<![CDATA[*/\n... <x a> ...\n/*]]>*/\n", markup.get(2).toString());
 	}
 
 	/**
@@ -456,7 +455,7 @@ public final class MarkupParserTest exte
 		tag = markup.get(0);
 		assertEquals("<script>", tag.toString());
 		tag = markup.get(1);
-		assertEquals("<!--/*--><![CDATA[/*><!--*/\n text \n/*-->]]>*/", tag.toString());
+		assertEquals("\n/*<![CDATA[*/\n text \n/*]]>*/\n", tag.toString());
 		tag = markup.get(2);
 		assertEquals("</script>", tag.toString());
 
@@ -492,7 +491,7 @@ public final class MarkupParserTest exte
 		tag = markup.get(1);
 		assertEquals("<script>", tag.toString());
 		tag = markup.get(2);
-		assertEquals("<!--/*--><![CDATA[/*><!--*/\n text \n/*-->]]>*/", tag.toString());
+		assertEquals("\n/*<![CDATA[*/\n text \n/*]]>*/\n", tag.toString());
 		tag = markup.get(3);
 		assertEquals("</script>", tag.toString());
 
@@ -501,7 +500,7 @@ public final class MarkupParserTest exte
 		tag = markup.get(1);
 		assertEquals("<script>", tag.toString());
 		tag = markup.get(2);
-		assertEquals("<!--/*--><![CDATA[/*><!--*/\n text \n/*-->]]>*/", tag.toString());
+		assertEquals("\n/*<![CDATA[*/\n text \n/*]]>*/\n", tag.toString());
 		tag = markup.get(3);
 		assertEquals("</script>", tag.toString());
 	}

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html Wed Apr  6 18:37:49 2011
@@ -5,7 +5,11 @@
   <title>CSS-basiertes Layout</title>
   <link rel="stylesheet" type="text/css" href="../../basis.css">
 
-  <style type="text/css">@import url(modern_ohne_ie.css) all;</style>
+  <style type="text/css">
+/*<![CDATA[*/
+@import url(modern_ohne_ie.css) all;
+/*]]>*/
+</style>
 
   <wicket:link>
   <!--[if IE]>
@@ -29,23 +33,43 @@
   <![endif]-->
   
   <!--[if IE]>
-    <style type="text/css">@import url(ie.css);</style>
+    <style type="text/css">
+/*<![CDATA[*/
+@import url(ie.css);
+/*]]>*/
+</style>
   <![endif]-->
 
   <!--[if IE 6]>
-    <style type="text/css">@import url(ie.css);</style>
+    <style type="text/css">
+/*<![CDATA[*/
+@import url(ie.css);
+/*]]>*/
+</style>
   <![endif]-->
 
   <!--[if gte IE 5.5]>
-    <style type="text/css">@import url(ie.css);</style>
+    <style type="text/css">
+/*<![CDATA[*/
+@import url(ie.css);
+/*]]>*/
+</style>
   <![endif]-->
 
   <!--[if lte IE 5.5999]>
-    <style type="text/css">@import url(ie.css);</style>
+    <style type="text/css">
+/*<![CDATA[*/
+@import url(ie.css);
+/*]]>*/
+</style>
   <![endif]-->
 
   <!--[if lt IE 5.1]>
-    <style type="text/css">@import url(ie.css);</style>
+    <style type="text/css">
+/*<![CDATA[*/
+@import url(ie.css);
+/*]]>*/
+</style>
   <![endif]-->
   </wicket:link>
 

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html Wed Apr  6 18:37:49 2011
@@ -5,12 +5,16 @@
   <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.SimplePage_13";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 <link rel="stylesheet" type="text/css" href="../../BasePage.css" />
 </head><body>
   </body>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.HideableBorderPage";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
   <div wicket:id="hideable"><wicket:border>
   <a wicket:id="hideLink" id="hideLink1" href="#" onclick="var wcall=wicketAjaxGet(&#039;../page?0-1.IBehaviorListener.0-hideable-hideLink&#039;,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$(&#039;hideLink1&#039;) != null;}.bind(this));return !wcall;">Hide contents</a>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -5,8 +5,12 @@
     <title>My Page</title>
   
     <script id="org-apache-wicket-markup-html-header-PanelA-0">
+/*<![CDATA[*/
+
         alert("BASE");
-    </script>
+    
+/*]]>*/
+</script>
   
     AA
   

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html Wed Apr  6 18:37:49 2011
@@ -3,9 +3,13 @@
   <title>AbstractPage.html</title>
 
   <script type="text/javascript" id="org-apache-wicket-markup-html-header-inheritance-MyPanel2-0">
+/*<![CDATA[*/
+
   function foo() {
      alert("Hello, World!");
   }
+
+/*]]>*/
 </script>
 </head>
 <body>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -4,8 +4,12 @@
   <title>test page</title>
 
     <script languange="javascript" id="org-apache-wicket-markup-html-header-testing-TestExtendedPanel-0">
+/*<![CDATA[*/
+
       alert('wicket head works in extended panel !');
-    </script>
+    
+/*]]>*/
+</script>
   </head>
 <body>
   body text here<br>

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_7";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 
 <div wicket:id="container">

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html Wed Apr  6 18:37:49 2011
@@ -2,12 +2,16 @@
 <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
 <script type="text/javascript" src="../resource/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">
+/*<![CDATA[*/
 wicketAjaxDebugEnable=true;
-/*-->]]>*/</script>
-<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" id="wicket-ajax-base-url">
+/*<![CDATA[*/
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_8";
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head><body>
 
 <div wicket:id="first">

Modified: wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html?rev=1089558&r1=1089557&r2=1089558&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html (original)
+++ wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html Wed Apr  6 18:37:49 2011
@@ -4,13 +4,18 @@
 <title>Wicket Examples - dates</title>
 <link rel="stylesheet" type="text/css" href="../../style.css"/>
 <style type="text/css">
+/*<![CDATA[*/
+
 th {
 	color: grey;
 }
+
+/*]]>*/
 </style>
 <script type="text/javascript" src="../resource/org.apache.wicket.extensions.yui.YuiLib/yuiloader/yuiloader.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -62,11 +67,15 @@ wicketYuiLoader.addModule({
 });
 wicketYuiLoader.insert();
 ;});
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { wicketCalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};;});
-/*-->]]>*/</script>
-<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -89,7 +98,8 @@ wicketCalendarAdd(function() {
 	
 });
 ;});
-/*-->]]>*/</script>
+/*]]>*/
+</script>
 </head>
 <body>
 <form wicket:id="localeForm" id="localeForm2" method="post" action="../page?0-1.IFormSubmitListener-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>