[wicket] branch wicket-9.x updated: WICKET-7078 CSP: inline JS in Choices and Selection of Palette

[adelbene]

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

adelbene pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-9.x by this push:
     new 7d62947880 WICKET-7078 CSP: inline JS in Choices and Selection of 
Palette
7d62947880 is described below

commit 7d629478805be76a2dcb982fc51aae61105d13d9
Author: rkurucz <roland.kur...@eos-hungary.hu>
AuthorDate: Tue Oct 10 10:25:29 2023 +0200

    WICKET-7078 CSP: inline JS in Choices and Selection of Palette
---
 .../markup/html/form/palette/component/Choices.java        | 14 ++++++--------
 .../markup/html/form/palette/component/Selection.java      | 13 ++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java
index ad8b5936f4..29b1316816 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java
@@ -19,8 +19,8 @@ package 
org.apache.wicket.extensions.markup.html.form.palette.component;
 import java.util.Iterator;
 
 import org.apache.wicket.extensions.markup.html.form.palette.Palette;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.util.value.IValueMap;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnEventHeaderItem;
 
 
 /**
@@ -44,19 +44,17 @@ public class Choices<T> extends AbstractOptions<T>
                super(id, palette);
        }
 
-
        @Override
-       protected void onComponentTag(final ComponentTag tag)
+       public void renderHead(IHeaderResponse response)
        {
-               super.onComponentTag(tag);
-               IValueMap attrs = tag.getAttributes();
+               super.renderHead(response);
                String onFocus = getPalette().getChoicesOnFocusJS();
                if (onFocus != null)
                {
-                       attrs.put("onfocus", onFocus);
+                       response.render(OnEventHeaderItem.forComponent(this, 
"focus", onFocus));
                }
 
-               tag.getAttributes().put("ondblclick", 
getPalette().getAddOnClickJS());
+               response.render(OnEventHeaderItem.forComponent(this, 
"dblclick", getPalette().getAddOnClickJS()));
        }
 
        @Override
diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java
index 68561ff1e9..096ba7d15a 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java
@@ -19,8 +19,8 @@ package 
org.apache.wicket.extensions.markup.html.form.palette.component;
 import java.util.Iterator;
 
 import org.apache.wicket.extensions.markup.html.form.palette.Palette;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.util.value.IValueMap;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnEventHeaderItem;
 
 
 /**
@@ -45,18 +45,17 @@ public class Selection<T> extends AbstractOptions<T>
        }
 
        @Override
-       protected void onComponentTag(final ComponentTag tag)
+       public void renderHead(IHeaderResponse response)
        {
-               super.onComponentTag(tag);
-               IValueMap attrs = tag.getAttributes();
+               super.renderHead(response);
 
                String onFocus = getPalette().getSelectionOnFocusJS();
                if (onFocus != null)
                {
-                       attrs.put("onfocus", onFocus);
+                       response.render(OnEventHeaderItem.forComponent(this, 
"focus", onFocus));
                }
 
-               tag.getAttributes().put("ondblclick", 
getPalette().getRemoveOnClickJS());
+               response.render(OnEventHeaderItem.forComponent(this, 
"dblclick", getPalette().getRemoveOnClickJS()));
        }
 
        @Override