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 696fd42 WICKET-6726: remove inline styling from Form
696fd42 is described below
commit 696fd425182eb94b1c595f643b7733565a2a2a57
Author: Emond Papegaaij <[email protected]>
AuthorDate: Wed Jan 22 17:23:11 2020 +0100
WICKET-6726: remove inline styling from Form
---
.../src/main/java/org/apache/wicket/Application.properties | 2 --
.../src/main/java/org/apache/wicket/css/wicket-core.css | 8 ++++++++
.../src/main/java/org/apache/wicket/markup/html/form/Form.java | 10 +++-------
.../markup/html/repeater/data/table/filter/FilterForm.java | 9 +++------
4 files changed, 14 insertions(+), 15 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 ca23a00..2c61673 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties
@@ -85,5 +85,3 @@ OddEvenListItem.CSS.even=even
AutoLabel.CSS.required=required
AutoLabel.CSS.invalid=error
AutoLabel.CSS.disabled=disabled
-
-Form.CSS.hidden-fields=hidden-fields
diff --git a/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
index d4e8c79..787ffa9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
+++ b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
@@ -16,4 +16,12 @@
*/
.wicket--hidden {
display: none!important;
+}
+.wicket--hidden-fields {
+ width: 0px;
+ height: 0px;
+ position: absolute;
+ left: -100px;
+ top: -100px;
+ overflow: hidden;
}
\ No newline at end of file
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 df0f28d..9987c01 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,7 +35,6 @@ 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;
@@ -1225,10 +1224,8 @@ public class Form<T> extends WebMarkupContainer
{
AppendingStringBuffer buffer = new AppendingStringBuffer();
- String cssClass = getString(CssUtils.key(Form.class,
"hidden-fields"));
-
// div that is not visible (but not display:none either)
- buffer.append(String.format("<div
style=\"width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden\"
class=\"%s\">", cssClass));
+ buffer.append("<div class=\"wicket--hidden-fields\">");
// add an empty textfield (otherwise IE doesn't work)
buffer.append("<input type=\"text\" tabindex=\"-1\"
autocomplete=\"off\"/>");
@@ -1711,9 +1708,8 @@ public class Form<T> extends WebMarkupContainer
// and have to write the url parameters as hidden fields
if (encodeUrlInHiddenFields())
{
- String cssClass = getString(CssUtils.key(Form.class,
"hidden-fields"));
-
- getResponse().write(String.format("<div id=\"%s\"
style=\"width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden\"
class=\"%s\">", getHiddenFieldsId(), cssClass));
+ getResponse().write(String.format("<div id=\"%s\"
class=\"wicket--hidden-fields\">",
+ getHiddenFieldsId()));
AppendingStringBuffer buffer = new
AppendingStringBuffer();
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
index a5caa38..d4ccb6f 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
@@ -18,7 +18,6 @@ package
org.apache.wicket.extensions.markup.html.repeater.data.table.filter;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -88,12 +87,10 @@ public class FilterForm<T> extends Form<T>
String id =
Strings.escapeMarkup(getFocusTrackerFieldCssId()).toString();
String value =
getRequest().getPostParameters().getParameterValue(id).toString("");
- String cssClass = getString(CssUtils.key(Form.class,
"hidden-fields"));
- getResponse().write(
- String.format(
- "<div style='position: absolute; left: -9999px;
width: 1px; height: 1px;' class='%s'><input type='hidden' name='%s' id='%s'
value='%s'/><input type='submit'/></div>",
- cssClass, id, id, Strings.escapeMarkup(value)));
+ getResponse().write(String.format(
+ "<div class='wicket--hidden-fields'><input
type='hidden' name='%s' id='%s' value='%s'/><input type='submit'/></div>",
+ id, id, Strings.escapeMarkup(value)));
}
/**
