[wicket] branch csp updated: WICKET-6731: Use OnEventHeaderItem to render event bindings

[papegaaij]

This is an automated email from the ASF dual-hosted git repository.

papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/csp by this push:
     new a0d0101  WICKET-6731: Use OnEventHeaderItem to render event bindings
a0d0101 is described below

commit a0d0101c610998dc1139ab3e04133dd3aa59625e
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Sun Feb 2 19:54:34 2020 +0100

    WICKET-6731: Use OnEventHeaderItem to render event bindings
---
 .../main/java/org/apache/wicket/markup/html/form/Form.java   | 12 +++++-------
 .../java/org/apache/wicket/markup/html/form/SubmitLink.java  |  7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index 2ffc52b..e2fedf1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -40,7 +40,7 @@ import org.apache.wicket.event.IEvent;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnEventHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.markup.html.form.validation.FormValidatorAdapter;
@@ -1274,15 +1274,13 @@ public class Form<T> extends WebMarkupContainer
        {
                final Component submittingComponent = (Component) 
defaultSubmittingComponent;
                AppendingStringBuffer buffer = new AppendingStringBuffer();
-               buffer.append("Wicket.Event.add('" + 
getHiddenFieldsId(HIDDEN_FIELDS_SUBMIT_IDX)
-                       + "', 'click', function(event) { var 
b=document.getElementById('");
+               buffer.append("var b=document.getElementById('");
                buffer.append(submittingComponent.getMarkupId());
-               buffer.append(
-                       "'); if (b!=null && b.onclick!=null && 
typeof(b.onclick) != 'undefined') ");
+               buffer.append("'); if (b!=null && b.onclick!=null && 
typeof(b.onclick) != 'undefined') ");
                buffer.append(
                        "{  var r = Wicket.bind(b.onclick, b)(); if (r != 
false) b.click(); } else { b.click(); };  return false;");
-               buffer.append("});");
-               
headerResponse.render(OnDomReadyHeaderItem.forScript(buffer.toString()));
+               headerResponse.render(OnEventHeaderItem
+                       .forScript(getHiddenFieldsId(HIDDEN_FIELDS_SUBMIT_IDX), 
"click", buffer.toString()));
        }
 
        /**
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
index d8c9426..60b4e16 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
@@ -18,9 +18,8 @@ package org.apache.wicket.markup.html.form;
 
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnEventHeaderItem;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.string.AppendingStringBuffer;
 
 /**
  * A link which can be used exactly like a Button to submit a Form. The 
onclick of the link will use
@@ -189,8 +188,8 @@ public class SubmitLink extends AbstractSubmitLink
 
                if (isEnabledInHierarchy())
                {
-                       
response.render(OnDomReadyHeaderItem.forScript("Wicket.Event.add('" + 
getMarkupId()
-                               + "', 'click', function(event) { " + 
getTriggerJavaScript() + " });"));
+                       response.render(
+                               OnEventHeaderItem.forScript(getMarkupId(), 
"click", getTriggerJavaScript()));
                }
        }