You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/01/24 07:50:44 UTC
[wicket] branch csp-form updated: WICKET-6727: configurable css
classnames
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp-form
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/csp-form by this push:
new 236b388 WICKET-6727: configurable css classnames
236b388 is described below
commit 236b38807d8b7d9925d8b4fccfbc85496512c7b5
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Fri Jan 24 08:49:50 2020 +0100
WICKET-6727: configurable css classnames
---
.../main/java/org/apache/wicket/Application.properties | 3 +++
.../src/main/java/org/apache/wicket/Component.java | 15 ++++++---------
.../java/org/apache/wicket/markup/html/form/Form.java | 9 ++++++---
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.properties b/wicket-core/src/main/java/org/apache/wicket/Application.properties
index 2c61673..7ef2b98 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties
@@ -85,3 +85,6 @@ OddEvenListItem.CSS.even=even
AutoLabel.CSS.required=required
AutoLabel.CSS.invalid=error
AutoLabel.CSS.disabled=disabled
+
+Component.CSS.hidden=wicket--hidden
+Form.CSS.hidden-fields=wicket--hidden-fields
\ No newline at end of file
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index bb9c1ad..6f00579 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -36,6 +36,7 @@ import org.apache.wicket.core.request.handler.ListenerRequestHandler;
import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.core.util.string.ComponentStrings;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.event.IEventSink;
@@ -2361,15 +2362,11 @@ public abstract class Component
*/
protected void renderPlaceholderTag(final ComponentTag tag, final Response response)
{
- String name = Strings.isEmpty(tag.getNamespace()) ? tag.getName() : tag.getNamespace() + ':' + tag.getName();
-
- response.write("<");
- response.write(name);
- response.write(" id=\"");
- response.write(getAjaxRegionMarkupId());
- response.write("\" class=\"wicket--hidden\" data-wicket-placeholder=\"\"></");
- response.write(name);
- response.write(">");
+ String name = Strings.isEmpty(tag.getNamespace()) ? tag.getName()
+ : tag.getNamespace() + ':' + tag.getName();
+ response
+ .write(String.format("<%s id=\"%s\" class=\"%s\" data-wicket-placeholder=\"\"></%s>",
+ name, getAjaxRegionMarkupId(), CssUtils.key(Component.class, "hidden"), name));
}
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 4d669c2..f03ff35 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
@@ -35,6 +35,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
@@ -1241,7 +1242,8 @@ public class Form<T> extends WebMarkupContainer
AppendingStringBuffer buffer = new AppendingStringBuffer();
// div that is not visible (but not display:none either)
- buffer.append("<div class=\"wicket--hidden-fields\">");
+ buffer
+ .append(String.format("<div class=\"%s\">", CssUtils.key(Form.class, "hidden-fields")));
// add an empty textfield (otherwise IE doesn't work)
buffer.append("<input type=\"text\" tabindex=\"-1\" autocomplete=\"off\"/>");
@@ -1759,8 +1761,9 @@ public class Form<T> extends WebMarkupContainer
// and have to write the url parameters as hidden fields
if (encodeUrlInHiddenFields())
{
- getResponse().write(String.format("<div id=\"%s\" class=\"wicket--hidden-fields\">",
- getHiddenFieldsId(HIDDEN_FIELDS_PARAMS_IDX)));
+ getResponse().write(String.format("<div id=\"%s\" class=\"%s\">",
+ getHiddenFieldsId(HIDDEN_FIELDS_PARAMS_IDX),
+ CssUtils.key(Form.class, "hidden-fields")));
AppendingStringBuffer buffer = new AppendingStringBuffer();