Author: jdonnerstag
Date: Wed Dec 31 02:09:27 2008
New Revision: 730364
URL: http://svn.apache.org/viewvc?rev=730364&view=rev
Log:
fixed wicket-1553: Pass the event to the event handler in
HeaderResponse.renderOnEventJavascript
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=730364&r1=730363&r2=730364&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
Wed Dec 31 02:09:27 2008
@@ -313,7 +313,7 @@
{
renderJavascriptReference(WicketEventReference.INSTANCE);
JavascriptUtils.writeJavascript(getResponse(),
"Wicket.Event.add(" + target +
- ", \"" + event + "\", function() { " +
javascript + ";});");
+ ", \"" + event + "\", function(event) {
" + javascript + ";});");
markRendered(token);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html?rev=730364&r1=730363&r2=730364&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
Wed Dec 31 02:09:27 2008
@@ -4,22 +4,22 @@
<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[/*><!--*/
-Wicket.Event.add(window, "domready", function() { domReady();;});
+Wicket.Event.add(window, "domready", function(event) { domReady();;});
/*-->]]>*/</script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "load", function() { onLoad();;});
+Wicket.Event.add(window, "load", function(event) { onLoad();;});
/*-->]]>*/</script>
<link href="../test2"/>
<script type="text/javascript" src="javascripturlB"></script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "domready", function() { domReadyB();;});
+Wicket.Event.add(window, "domready", function(event) { domReadyB();;});
/*-->]]>*/</script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "load", function() { onLoadB();;});
+Wicket.Event.add(window, "load", function(event) { onLoadB();;});
/*-->]]>*/</script>
<script type="text/javascript"
src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
@@ -47,6 +47,6 @@
<span wicket:id="btest3" id="btest36"><wicket:panel>
test
</wicket:panel></span>
-<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link"
onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:',null,null,
function() {return Wicket.$('link7') != null;}.bind(this));return !wcall;"
id="link7">Test</a>
+<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link"
id="link7" onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:',null,null,
function() {return Wicket.$('link7') != null;}.bind(this));return
!wcall;">Test</a>
</body>
</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html?rev=730364&r1=730363&r2=730364&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
Wed Dec 31 02:09:27 2008
@@ -4,11 +4,11 @@
<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[/*><!--*/
-Wicket.Event.add(window, "domready", function() { domReady();;});
+Wicket.Event.add(window, "domready", function(event) { domReady();;});
/*-->]]>*/</script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "load", function() { onLoad();;});
+Wicket.Event.add(window, "load", function(event) { onLoad();;});
/*-->]]>*/</script>
<script type="text/javascript"
src="resources/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
@@ -27,6 +27,6 @@
<span wicket:id="test3" id="test33"><wicket:panel>
test
</wicket:panel></span>
-<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link"
onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:',null,null,
function() {return Wicket.$('link4') != null;}.bind(this));return !wcall;"
id="link4">Test</a>
+<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link"
id="link4" onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:',null,null,
function() {return Wicket.$('link4') != null;}.bind(this));return
!wcall;">Test</a>
</body>
</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java?rev=730364&r1=730363&r2=730364&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
Wed Dec 31 02:09:27 2008
@@ -154,7 +154,7 @@
if (inBodyOnLoad)
{
- String bodyOnLoadUpdateScript =
"Wicket.Event.add(window, \"load\", function() { " +
+ String bodyOnLoadUpdateScript =
"Wicket.Event.add(window, \"load\", function(event) { " +
updateScript + ";});";
validateTimerScript(document, bodyOnLoadUpdateScript);
}
@@ -181,9 +181,9 @@
* Checks that the timer javascript is in the document once and only
once
*
* @param document
- * the response from the Application
+ * the response from the Application
* @param updateScript
- * the timer script
+ * the timer script
*/
private void validateTimerScript(String document, String updateScript)
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html?rev=730364&r1=730363&r2=730364&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
Wed Dec 31 02:09:27 2008
@@ -7,14 +7,14 @@
/*-->]]>*/</script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "domready", function() { test1();;});
+Wicket.Event.add(window, "domready", function(event) { test1();;});
/*-->]]>*/</script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "domready", function() { test2();;});
+Wicket.Event.add(window, "domready", function(event) { test2();;});
/*-->]]>*/</script>
</head><body>
-<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test"
onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:',null,null,
function() {return Wicket.$('test1') != null;}.bind(this));return !wcall;"
id="test1">Test</a>
+<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test"
id="test1" onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:',null,null,
function() {return Wicket.$('test1') != null;}.bind(this));return
!wcall;">Test</a>
</body>
</html>
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html?rev=730364&r1=730363&r2=730364&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
Wed Dec 31 02:09:27 2008
@@ -9,7 +9,7 @@
/*-->]]>*/</script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "load", function() { setTimeout("var
wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true',null,null,
function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c
!= null}.bind(this));", 2000);;});
+Wicket.Event.add(window, "load", function(event) { setTimeout("var
wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IActivePageBehaviorListener:0:&wicket:ignoreIfNotActive=true',null,null,
function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c
!= null}.bind(this));", 2000);;});
/*-->]]>*/</script>
</head>
