You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/03/11 11:36:44 UTC
git commit: WICKET-5080 moved focus handling to FilterForm
Updated Branches:
refs/heads/master ddfef631e -> 633b13bbf
WICKET-5080 moved focus handling to FilterForm
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/633b13bb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/633b13bb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/633b13bb
Branch: refs/heads/master
Commit: 633b13bbf5fc7d7c7e4fce6c2aeed19ca74ce506
Parents: ddfef63
Author: svenmeier <sv...@apache.org>
Authored: Mon Mar 11 11:36:14 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Mon Mar 11 11:36:14 2013 +0100
----------------------------------------------------------------------
.../repeater/data/table/filter/FilterForm.java | 30 +++++++---
.../repeater/data/table/filter/FilterToolbar.html | 21 -------
.../data/table/filter/wicket-filterform.js | 45 +++++++++++++++
3 files changed, 66 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/633b13bb/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
----------------------------------------------------------------------
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 2139226..39bae7a 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
@@ -21,20 +21,23 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
/**
* A form with filter-related special functionality for its form components.
- *
+ *
* <p>
- * This form uses an invisible button to be able to submit when the user presses
- * the <em>ENTER</em> key. If there is a need to add an explicit
- * {@link org.apache.wicket.markup.html.form.IFormSubmittingComponent} to this form
- * then {@link Form#setDefaultButton(org.apache.wicket.markup.html.form.IFormSubmittingComponent)}
- * should be used to specify this custom submitting component.
+ * This form uses an invisible button to be able to submit when the user presses the <em>ENTER</em>
+ * key. If there is a need to add an explicit
+ * {@link org.apache.wicket.markup.html.form.IFormSubmittingComponent} to this form then
+ * {@link Form#setDefaultButton(org.apache.wicket.markup.html.form.IFormSubmittingComponent)} should
+ * be used to specify this custom submitting component.
* </p>
*
* @param <T>
@@ -44,6 +47,10 @@ import org.apache.wicket.util.string.Strings;
public class FilterForm<T> extends Form<T>
{
private static final long serialVersionUID = 1L;
+
+ private static final ResourceReference JS = new JavaScriptResourceReference(FilterForm.class,
+ "wicket-filterform.js");
+
private final IFilterStateLocator<T> locator;
/**
@@ -63,8 +70,11 @@ public class FilterForm<T> extends Form<T>
public void renderHead(final IHeaderResponse response)
{
super.renderHead(response);
- response.render(OnLoadHeaderItem.forScript("_filter_focus_restore('" +
- getFocusTrackerFieldCssId() + "');"));
+
+ response.render(JavaScriptHeaderItem.forReference(JS));
+
+ response.render(OnLoadHeaderItem.forScript(String.format(
+ "Wicket.FilterForm.restore('%s');", getFocusTrackerFieldCssId())));
}
/**
@@ -74,6 +84,7 @@ public class FilterForm<T> extends Form<T>
public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
super.onComponentTagBody(markupStream, openTag);
+
String id = Strings.escapeMarkup(getFocusTrackerFieldCssId()).toString();
String value = getRequest().getPostParameters().getParameterValue(id).toString("");
getResponse().write(
@@ -122,6 +133,7 @@ public class FilterForm<T> extends Form<T>
public void onComponentTag(final Component component, final ComponentTag tag)
{
tag.put("onfocus", getFocusTrackingHandler(component));
+
super.onComponentTag(component, tag);
}
});
@@ -143,6 +155,6 @@ public class FilterForm<T> extends Form<T>
*/
public final String getFocusTrackingHandler(final Component component)
{
- return ("_filter_focus(this, '" + getFocusTrackerFieldCssId() + "');");
+ return String.format("Wicket.FilterForm.focused(this, '%s');", getFocusTrackerFieldCssId());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/633b13bb/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.html b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.html
index 99f4805..546c561 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.html
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.html
@@ -16,27 +16,6 @@
limitations under the License.
-->
<html xmlns:wicket="http://wicket.apache.org/">
-<wicket:head>
-
- <script type="text/javascript">
-
- function _filter_focus(ctrl, trackerId) {
- document.getElementById(trackerId).value=ctrl.id;
- }
-
- function _filter_focus_restore(trackerId) {
- var tracker=document.getElementById(trackerId);
- if (tracker!=null) {
- var focused=tracker.value;
- if (focused!="") {
- document.getElementById(focused).focus();
- }
- }
- }
-
- </script>
-
-</wicket:head>
<wicket:panel>
<tr class="filters-tr">
<wicket:container wicket:id="filters">
http://git-wip-us.apache.org/repos/asf/wicket/blob/633b13bb/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/wicket-filterform.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/wicket-filterform.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/wicket-filterform.js
new file mode 100644
index 0000000..9fedebc
--- /dev/null
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/wicket-filterform.js
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+;(function (undefined) {
+ 'use strict';
+
+ if (!window.Wicket) {
+ window.Wicket = {};
+ }
+
+ if (Wicket.FilterForm) {
+ return;
+ }
+
+ Wicket.FilterForm = {
+ focused: function(ctrl, trackerId) {
+ document.getElementById(trackerId).value=ctrl.id;
+ },
+
+ restore: function(trackerId) {
+ var tracker = document.getElementById(trackerId);
+ if (tracker !== null) {
+ var focused = tracker.value;
+ if (focused !== "") {
+ document.getElementById(focused).focus();
+ }
+ }
+ }
+ };
+
+})();
\ No newline at end of file