This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new b8a3d5d WICKET-6747 use "hidden" attribute
b8a3d5d is described below
commit b8a3d5d36331a8ad16f4a1c62b75bafe10d8b5b2
Author: Sven Meier <[email protected]>
AuthorDate: Tue Mar 24 13:21:57 2020 +0100
WICKET-6747 use "hidden" attribute
---
.../java/org/apache/wicket/Application.properties | 3 +-
.../src/main/java/org/apache/wicket/Component.java | 7 ++-
.../wicket/css/WicketCoreCSSResourceReference.java | 36 --------------
.../java/org/apache/wicket/css/wicket-core.css | 27 -----------
.../org/apache/wicket/markup/html/form/Form.java | 13 +++--
.../wicket/markup/html/pages/BrowserInfoForm.html | 2 +-
.../org/apache/wicket/mock/MockApplication.java | 3 --
.../wicket/protocol/http/WebApplication.java | 6 ---
.../apache/wicket/settings/ResourceSettings.java | 56 +---------------------
.../org/apache/wicket/PlaceholderTagIdTest.java | 2 +-
.../form/FormDefaultButtonTestPage_expected.html | 2 +-
.../html/form/FormMethodTestPage_expected.html | 2 +-
.../form/NestedFormsTest_placeholder_expected.html | 2 +-
.../html/form/pageWithParameters_expected.html | 2 +-
.../markup/html/internal/AjaxEnclosureTest.java | 2 +-
.../InlineEnclosurePageExpectedResult_1.html | 2 +-
...reWithWicketMessagePage_invisible_expected.html | 2 +-
.../markup/html/internal/TogglePageTest.java | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../wicket/queueing/ComponentQueueingTest.java | 2 +-
.../wicket/examples/sri/IntegrityDemoPage.html | 2 +-
.../ajax/markup/html/AjaxIndicatorAppender.java | 2 +-
.../markup/html/form/upload/UploadProgressBar.html | 4 +-
.../ajax/markup/html/form/upload/progressbar.js | 10 ++--
.../repeater/data/table/filter/FilterForm.java | 7 +--
.../table/filter/FilterFormTestPage_expected.html | 2 +-
26 files changed, 39 insertions(+), 163 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 d63888d..7b559a6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties
@@ -89,5 +89,4 @@ AutoLabel.CSS.disabled=disabled
FormComponentFeedbackBorder.CSS.error=feedbackBorderERROR
FormComponentFeedbackIndicator.CSS.error=feedbackIndicatorERROR
-Component.CSS.hidden=wicket--hidden
-Form.CSS.hidden-fields=wicket--hidden-fields
\ No newline at end of file
+Form.CSS.hidden-fields=hidden-fields
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 5da2246..1fd5cbe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -36,7 +36,6 @@ 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;
@@ -2367,8 +2366,8 @@ public abstract class Component
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(),
getString(CssUtils.key(Component.class, "hidden")), name));
+ String.format("<%s id=\"%s\" hidden=\"\"
data-wicket-placeholder=\"\"></%s>", name,
+ getAjaxRegionMarkupId(), name));
}
@@ -3042,7 +3041,7 @@ public abstract class Component
/**
* Render a placeholder tag when the component is not visible. The tag
is of form:
- * <componenttag class="wicket--hidden" id="markupid"/>. This
method will also call
+ * <componenttag hidden=""" id="markupid"/>. This method will
also call
* <code>setOutputMarkupId(true)</code>.
*
* This is useful, for example, in ajax situations where the component
starts out invisible and
diff --git
a/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
b/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
deleted file mode 100644
index 0134681..0000000
---
a/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.css;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public final class WicketCoreCSSResourceReference extends CssResourceReference
-{
- private static final long serialVersionUID = 6795863553105608280L;
-
- private static final WicketCoreCSSResourceReference INSTANCE = new
WicketCoreCSSResourceReference();
-
- public static WicketCoreCSSResourceReference get()
- {
- return INSTANCE;
- }
-
- private WicketCoreCSSResourceReference()
- {
- super(WicketCoreCSSResourceReference.class, "wicket-core.css");
- }
-}
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
deleted file mode 100644
index 87dfd10..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-.wicket--hidden {
- display: none;
-}
-.wicket--hidden-fields {
- width: 0px;
- height: 0px;
- position: absolute;
- left: -100px;
- top: -100px;
- overflow: hidden;
-}
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 c1c437b..35be666 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
@@ -149,6 +149,9 @@ public class Form<T> extends WebMarkupContainer
{
public static final String ENCTYPE_MULTIPART_FORM_DATA =
"multipart/form-data";
+ public static final String HIDDEN_FIELDS_CSS_CLASS_KEY = CssUtils
+ .key(Form.class, "hidden-fields");
+
/**
* Visitor used for validation
*
@@ -1252,9 +1255,9 @@ public class Form<T> extends WebMarkupContainer
{
AppendingStringBuffer buffer = new AppendingStringBuffer();
- // div that is not visible (but not display:none either)
- buffer.append(String.format("<div class=\"%s\">",
- getString(CssUtils.key(Form.class, "hidden-fields"))));
+ // hidden div
+ buffer.append(String.format("<div hidden=\"\" class=\"%s\">",
+ getString(HIDDEN_FIELDS_CSS_CLASS_KEY)));
// add an empty textfield (otherwise IE doesn't work)
buffer.append("<input type=\"text\" tabindex=\"-1\"
autocomplete=\"off\"/>");
@@ -1765,9 +1768,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=\"%s\">",
+ getResponse().write(String.format("<div id=\"%s\"
hidden=\"\" class=\"%s\">",
getHiddenFieldsId(HIDDEN_FIELDS_PARAMS_IDX),
- getString(CssUtils.key(Form.class,
"hidden-fields"))));
+ getString(HIDDEN_FIELDS_CSS_CLASS_KEY)));
AppendingStringBuffer buffer = new
AppendingStringBuffer();
diff --git
a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
index aa06f69..2e25eeb 100644
---
a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
+++
b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
@@ -18,7 +18,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <form name="postback" wicket:id="postback"
class="wicket--hidden-fields">
+ <form name="postback" wicket:id="postback" hidden="">
</form>
</wicket:panel>
</html>
diff --git
a/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
b/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
index ecee55c..2ecd896 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
@@ -71,9 +71,6 @@ public class MockApplication extends WebApplication
// for test cases we usually want stable resource names
getResourceSettings().setCachingStrategy(NoOpResourceCachingStrategy.INSTANCE);
- // the core CSS causes noise (a head + link in every generated
markup) in tests
- // and isn't needed, because the markup isn't rendered by a
browser
- getResourceSettings().disableWicketCoreCSS();
// disable nonces, CSP is not needed anyway during tests
getCspSettings().blocking().disabled();
}
diff --git
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index a1763c5..c682e715 100644
---
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@ -756,12 +756,6 @@ public abstract class WebApplication extends Application
getAjaxRequestTargetListeners().add(new
AjaxEnclosureListener());
- getHeaderContributorListeners().add(head -> {
-
getResourceSettings().getWicketCoreCSS().ifPresent(wicketCoreCSS -> {
-
head.render(CssHeaderItem.forReference(wicketCoreCSS));
- });
- });
-
getCspSettings().enforce(this);
// Configure the app.
diff --git
a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
index 308f222..8639402 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
@@ -31,14 +30,12 @@ import
org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import
org.apache.wicket.core.util.resource.locator.caching.CachingResourceStreamLocator;
import org.apache.wicket.css.ICssCompressor;
-import org.apache.wicket.css.WicketCoreCSSResourceReference;
import org.apache.wicket.javascript.IJavaScriptCompressor;
import org.apache.wicket.markup.head.PriorityFirstComparator;
import org.apache.wicket.markup.head.ResourceAggregator.RecordedHeaderItem;
import org.apache.wicket.markup.html.IPackageResourceGuard;
import org.apache.wicket.markup.html.SecurePackageResourceGuard;
import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.resource.CssResourceReference;
import
org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy;
import org.apache.wicket.request.resource.caching.IResourceCachingStrategy;
import org.apache.wicket.request.resource.caching.NoOpResourceCachingStrategy;
@@ -60,7 +57,6 @@ import org.apache.wicket.util.file.IResourceFinder;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.watch.IModificationWatcher;
import org.apache.wicket.util.watch.ModificationWatcher;
@@ -177,9 +173,6 @@ public class ResourceSettings implements
IPropertiesFactoryContext
private boolean encodeJSessionId = false;
- private Optional<CssResourceReference> wicketCoreCSS =
- Optional.of(WicketCoreCSSResourceReference.get());
-
/**
* Configures Wicket's default ResourceLoaders.<br>
* For an example in {@code FooApplication} let {@code bar.Foo} extend
{@link Component}, this
@@ -777,51 +770,4 @@ public class ResourceSettings implements
IPropertiesFactoryContext
this.encodeJSessionId = encodeJSessionId;
return this;
}
-
- /**
- * Returns the resource reference of the core stylesheet for Wicket.
This stylesheet contains
- * some lowlevel styling used by Wicket. When the Wicket core
stylesheet has been disabled, this
- * returns an empty {@code Optional}.
- *
- * @return The resource reference of the base stylesheet for Wicket.
- */
- public Optional<CssResourceReference> getWicketCoreCSS()
- {
- return wicketCoreCSS;
- }
-
- /**
- * Replaces the core stylesheet for Wicket. Changes made to the styling
can break functionality
- * like {@link Component#setOutputMarkupPlaceholderTag(boolean)},
causing components that should
- * not be visible to be displayed. Make sure the replacement stylesheet
has matching definitions
- * for the corresponding sections in the Wicket version.
- *
- * @param wicketCoreCSS
- * The replacement styleheet.
- * @return {@code this} object for chaining
- */
- public ResourceSettings setWicketCoreCSS(CssResourceReference
wicketCoreCSS)
- {
- if (wicketCoreCSS == null)
- {
- throw new NullPointerException(
- "Cannot set the Wicket core CSS to null, use
disableWicketCoreCSS() instead.");
- }
- this.wicketCoreCSS = Optional.of(wicketCoreCSS);
- return this;
- }
-
- /**
- * Disables the Wicket core CSS. You application should package
corresponding styling
- * definitions in its CSS to prevent hidden components to be displayed.
The Wicket core CSS can
- * also be disabled for {@link WicketTester} tests to prevent the core
CSS to popup in testcases
- * when the resulting HTML is not rendered by a browser.
- *
- * @return {@code this} object for chaining
- */
- public ResourceSettings disableWicketCoreCSS()
- {
- this.wicketCoreCSS = Optional.empty();
- return this;
- }
-}
+}
\ No newline at end of file
diff --git
a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
index cdecfb7..64ece54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
@@ -42,7 +42,7 @@ class PlaceholderTagIdTest extends WicketTestCase
{
tester.startPage(TestPage.class);
- tester.assertContains("<form id=\"form1_region\"
class=\"wicket--hidden\" data-wicket-placeholder=\"\">");
+ tester.assertContains("<form id=\"form1_region\" hidden=\"\"
data-wicket-placeholder=\"\">");
}
/**
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
index ecd5c4f..65ae3be 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
@@ -10,7 +10,7 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
/*]]>*/
</script>
</head><body>
- <form wicket:id="form" id="form2" method="post"
action="./org.apache.wicket.markup.html.form.FormDefaultButtonTestPage?0-1.-form"><div
class="wicket--hidden-fields"><input type="text" tabindex="-1"
autocomplete="off"/><input id="form2_hf_1" type="submit" tabindex="-1"
name="default" /></div>
+ <form wicket:id="form" id="form2" method="post"
action="./org.apache.wicket.markup.html.form.FormDefaultButtonTestPage?0-1.-form"><div
hidden="" class="hidden-fields"><input type="text" tabindex="-1"
autocomplete="off"/><input id="form2_hf_1" type="submit" tabindex="-1"
name="default" /></div>
<button wicket:id="default" name="default"
id="default1"></button>
</form>
</body>
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
index 0bd35d1..8dd4866 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
<form wicket:id="formpost" id="formpost1" method="post"
action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost"></form>
- <form wicket:id="formget" id="formget2" method="get"
action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div
id="formget2_hf_0" class="wicket--hidden-fields"><input type="hidden"
name="0-1.-formget" value="" /></div></form>
+ <form wicket:id="formget" id="formget2" method="get"
action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div
id="formget2_hf_0" hidden="" class="hidden-fields"><input type="hidden"
name="0-1.-formget" value="" /></div></form>
</body>
</html>
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest_placeholder_expected.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest_placeholder_expected.html
index 61396f2..91e359c 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest_placeholder_expected.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsTest_placeholder_expected.html
@@ -1 +1 @@
-<html><body><form wicket:id="outerForm" id="outerForm1" method="post"
action="./page?0-1.-outerForm"> <input type="submit" wicket:id="outerSubmit"
name="outerSubmit" id="outerSubmit2"/> <div id="innerForm3"
class="wicket--hidden" data-wicket-placeholder=""></div></form></body></html>
\ No newline at end of file
+<html><body><form wicket:id="outerForm" id="outerForm1" method="post"
action="./page?0-1.-outerForm"> <input type="submit" wicket:id="outerSubmit"
name="outerSubmit" id="outerSubmit2"/> <div id="innerForm3" hidden=""
data-wicket-placeholder=""></div></form></body></html>
\ No newline at end of file
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
index 842f424..ed9223f 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
<form wicket:id="formpost" id="formpost1" method="post"
action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost&first=foo&second=bar"></form>
- <form wicket:id="formget" id="formget2" method="get"
action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div
id="formget2_hf_0" class="wicket--hidden-fields"><input type="hidden"
name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo"
/><input type="hidden" name="second" value="bar" /></div></form>
+ <form wicket:id="formget" id="formget2" method="get"
action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div
id="formget2_hf_0" hidden="" class="hidden-fields"><input type="hidden"
name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo"
/><input type="hidden" name="second" value="bar" /></div></form>
</body>
</html>
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
index 0564822..97837f6 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
@@ -42,7 +42,7 @@ class AjaxEnclosureTest extends WicketTestCase
{
private final String inlineEnclosureIdPrefix =
"wicket__InlineEnclosure_";
private final String inlineEnclosureHiddenPattern = "<div id=\"" +
inlineEnclosureIdPrefix +
- "\\w+\" class=\"wicket--hidden\"
data-wicket-placeholder=\"\"></div>";
+ "\\w+\" hidden=\"\" data-wicket-placeholder=\"\"></div>";
private final String inlineEnclosureVisiblePattern = "<div id=\"" +
inlineEnclosureIdPrefix +
"\\w+\">";
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
index fc28dc4..40ffd5b 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
@@ -11,7 +11,7 @@
</table>
</div>
-<span id="wicket__InlineEnclosure__15719789313" class="wicket--hidden"
data-wicket-placeholder=""></span>
+<span id="wicket__InlineEnclosure__15719789313" hidden=""
data-wicket-placeholder=""></span>
<div id="wicket__InlineEnclosure__15719789304">
<table>
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
index d1317ef..f48c978 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
@@ -21,6 +21,6 @@
<title>Wicket 4520</title>
</head>
<body>
- <div id="wicket__message__attr___4340036351" class="wicket--hidden"
data-wicket-placeholder=""></div>
+ <div id="wicket__message__attr___4340036351" hidden=""
data-wicket-placeholder=""></div>
</body>
</html>
\ No newline at end of file
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
index 8bd4eb8..9f95cbb 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
@@ -162,7 +162,7 @@ class TogglePageTest extends WicketTestCase
String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_";
String inlineEnclosureHiddenPattern = "<tr id=\"" +
inlineEnclosureIdPrefix +
- "\\w+\" class=\"wicket--hidden\"
data-wicket-placeholder=\"\"></tr>";
+ "\\w+\" hidden=\"\" data-wicket-placeholder=\"\"></tr>";
String inlineEnclosureVisiblePattern = "<tr bgcolor=\"red\"
id=\"" +
inlineEnclosureIdPrefix + "\\w+\">";
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
index 59332e3..3a4f8fd 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
@@ -23,7 +23,7 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
<div wicket:id="first">
<span wicket:id="number">0</span><br/>
- <div id="nextContainer2" class="wicket--hidden"
data-wicket-placeholder=""></div>
+ <div id="nextContainer2" hidden="" data-wicket-placeholder=""></div>
</div>
<a wicket:id="add" id="add1" href="#">Add</a>
diff --git
a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
index c8051bf..e3f90b4 100644
---
a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
@@ -601,7 +601,7 @@ class ComponentQueueingTest extends WicketTestCase
a.setVisible(false);
tester.startPage(p);
- assertEquals("<div id=\"wicket__InlineEnclosure_20793898271\"
class=\"wicket--hidden\" data-wicket-placeholder=\"\"></div>",
tester.getLastResponseAsString());
+ assertEquals("<div id=\"wicket__InlineEnclosure_20793898271\"
hidden=\"\" data-wicket-placeholder=\"\"></div>",
tester.getLastResponseAsString());
}
/**
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
index fae1cfb..b08911a 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
@@ -8,7 +8,7 @@
<div id="sri">
<p class="sri-false color-red">Integrity test NOT passed</p>
- <p class="sri-true color-green wicket--hidden">Integrity test
passed</p>
+ <p class="sri-true color-green" hidden="">Integrity test passed</p>
</div>
</wicket:extend>
</body>
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
index ce2ee69..770ca19 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
@@ -95,7 +95,7 @@ public class AjaxIndicatorAppender extends Behavior
super.afterRender(component);
final Response r = component.getResponse();
- r.write("<span class=\"wicket--hidden ");
+ r.write("<span hidden=\"\" class=\"");
r.write(getSpanClass());
r.write("\" ");
r.write("id=\"");
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.html
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.html
index e679353..e22df29 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.html
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.html
@@ -17,7 +17,7 @@
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org";>
<div class="wupb-container">
- <div class="wupb-progressBar wicket--hidden" wicket:id="bar"><div
class="wupb-border"><div class="wupb-background"><div
class="wupb-foreground"></div></div></div></div>
- <div class="wupb-uploadStatus wicket--hidden" wicket:id="status"></div>
+ <div hidden="" class="wupb-progressBar" wicket:id="bar"><div
class="wupb-border"><div class="wupb-background"><div
class="wupb-foreground"></div></div></div></div>
+ <div hidden="" class="wupb-uploadStatus" wicket:id="status"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
index e2265bd..6cd0ad9 100644
---
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
+++
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
@@ -55,8 +55,8 @@
if (displayprogress) {
this.setPercent(0);
this.setStatus(this.initialStatus);
- Wicket.DOM.toggleClass(this.statusid,
'wicket--hidden', false);
- Wicket.DOM.toggleClass(this.barid,
'wicket--hidden', false);
+
Wicket.$(this.statusid).removeAttribute('hidden');
+ Wicket.$(this.barid).removeAttribute('hidden');
this.scheduleUpdate();
}
},
@@ -81,7 +81,7 @@
_createIFrame : function (iframeName) {
var $iframe = jQuery('<iframe name="'+iframeName+'"
id="'+iframeName+
- '" src="about:blank"
class="wicket--hidden-fields"></iframe>');
+ '" src="about:blank" hidden=""></iframe>');
return $iframe[0];
},
@@ -117,8 +117,8 @@
this.iframe = null;
if (progressPercent === '100') {
- Wicket.DOM.toggleClass(this.statusid,
'wicket--hidden', true);
- Wicket.DOM.toggleClass(this.barid,
'wicket--hidden', true);
+ Wicket.$(this.statusid).setAttribute('hidden',
'');
+ Wicket.$(this.barid).setAttribute('hidden', '');
} else {
this.scheduleUpdate();
}
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 d4ccb6f..2bc2006 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
@@ -87,10 +87,11 @@ public class FilterForm<T> extends Form<T>
String id =
Strings.escapeMarkup(getFocusTrackerFieldCssId()).toString();
String value =
getRequest().getPostParameters().getParameterValue(id).toString("");
-
+ String cssClass = getString(Form.HIDDEN_FIELDS_CSS_CLASS_KEY);
+
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)));
+ "<div hidden='' class='%s'><input type='hidden'
name='%s' id='%s' value='%s'/><input type='submit'/></div>",
+ cssClass, id, id, Strings.escapeMarkup(value)));
}
/**
diff --git
a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
index 8b3e253..980ad44 100644
---
a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
+++
b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
@@ -10,6 +10,6 @@ Wicket.FilterForm.restore('form1focus');;
/*]]>*/
</script>
</head><body>
- <form wicket:id="form" id="form1" method="post"
action="./org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterFormTestPage?0-1.-form"><div
class='wicket--hidden-fields'><input type='hidden' name='form1focus'
id='form1focus' value=''/><input type='submit'/></div></form>
+ <form wicket:id="form" id="form1" method="post"
action="./org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterFormTestPage?0-1.-form"><div
hidden='' class='hidden-fields'><input type='hidden' name='form1focus'
id='form1focus' value=''/><input type='submit'/></div></form>
</body>
</html>
