Repository: wicket Updated Branches: refs/heads/master c99a34dc2 -> 8042ef56a
WICKET-6540 ensure hidden div for default button is rendered correctly Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8042ef56 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8042ef56 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8042ef56 Branch: refs/heads/master Commit: 8042ef56ab8ff19421faf58e11ac102a48ab8880 Parents: c99a34d Author: Sven Meier <svenme...@apache.org> Authored: Fri Feb 23 18:25:02 2018 +0100 Committer: Sven Meier <svenme...@apache.org> Committed: Fri Feb 23 18:25:02 2018 +0100 ---------------------------------------------------------------------- .../apache/wicket/markup/html/form/Form.java | 4 +- .../html/form/FormDefaultButtonTestPage.html | 7 ++++ .../html/form/FormDefaultButtonTestPage.java | 41 ++++++++++++++++++++ .../FormDefaultButtonTestPage_expected.html | 7 ++++ .../wicket/markup/html/form/FormTest.java | 8 ++++ 5 files changed, 66 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8042ef56/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java ---------------------------------------------------------------------- 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 709779a..e91fa42 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 @@ -1212,7 +1212,9 @@ public class Form<T> extends WebMarkupContainer buffer.append("'); if (b!=null&&b.onclick!=null&&typeof(b.onclick) != 'undefined') { var r = Wicket.bind(b.onclick, b)(); if (r != false) b.click(); } else { b.click(); }; return false;\" "); buffer.append(" />"); - getResponse().write("</div>"); + // close div + buffer.append("</div>"); + getResponse().write(buffer); } http://git-wip-us.apache.org/repos/asf/wicket/blob/8042ef56/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.html new file mode 100644 index 0000000..710a6d4 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.html @@ -0,0 +1,7 @@ +<html> +<body> + <form wicket:id="form"> + <button wicket:id="default"></button> + </form> +</body> +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/8042ef56/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.java new file mode 100644 index 0000000..782746e --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage.java @@ -0,0 +1,41 @@ +/* + * 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.markup.html.form; + +import org.apache.wicket.markup.html.WebPage; + +/** + * @author dashorst + */ +public class FormDefaultButtonTestPage extends WebPage +{ + /** For serialization. */ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public FormDefaultButtonTestPage() + { + Form<Void> form = new Form<Void>("form"); + add(form); + + Button button = new Button("default"); + form.setDefaultButton(button); + form.add(button); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/8042ef56/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..9ab27de --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html @@ -0,0 +1,7 @@ +<html> +<body> + <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.FormDefaultButtonTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="text" tabindex="-1" autocomplete="off"/><input type="submit" tabindex="-1" name="default" onclick=" var b=document.getElementById('default2'); if (b!=null&&b.onclick!=null&&typeof(b.onclick) != 'undefined') { var r = Wicket.bind(b.onclick, b)(); if (r != false) b.click(); } else { b.click(); }; return false;" /></div> + <button wicket:id="default" name="default" id="default2"></button> + </form> +</body> +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/8042ef56/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java index 4bf48cb..b05740e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java @@ -53,6 +53,14 @@ public class FormTest extends WicketTestCase }; } + /** + * WICKET-6540 + */ + @Test + public void defaultButton() throws Exception + { + executeTest(FormDefaultButtonTestPage.class, "FormDefaultButtonTestPage_expected.html"); + } /** * WICKET-6525 / WICKET-6348
