You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/04/24 22:06:40 UTC
isis git commit: ISIS-1603: improves the tab focus a little bit
Repository: isis
Updated Branches:
refs/heads/ISIS-1603-no-xeditable 7341d7141 -> 328a29710
ISIS-1603: improves the tab focus a little bit
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/328a2971
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/328a2971
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/328a2971
Branch: refs/heads/ISIS-1603-no-xeditable
Commit: 328a2971043f9fff151d32cf6f62f4305f1f1b37
Parents: 7341d71
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 24 23:06:35 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 24 23:06:35 2017 +0100
----------------------------------------------------------------------
.../components/actionprompt/ActionPromptModalWindow.java | 2 +-
.../ui/components/property/PropertyEditFormPanel.java | 11 +++++++++++
.../ui/components/scalars/ScalarPanelAbstract.java | 2 ++
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 5 +++++
.../viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 11 +++++++++--
5 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/328a2971/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
index 35a9162..3ace133 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
@@ -47,6 +47,6 @@ public class ActionPromptModalWindow extends ModalDialog<Void> {
super.renderHead(response);
response.render(OnDomReadyHeaderItem.forScript(
- String.format("Wicket.Event.publish(Isis.Topic.FOCUS_FIRST_ACTION_PARAMETER, '%s')", getMarkupId())));
+ String.format("Wicket.Event.publish(Isis.Topic.FOCUS_FIRST_PARAMETER, '%s')", getMarkupId())));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/328a2971/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
index ca2e28e..2c6719e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptContentHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -80,6 +81,16 @@ public class PropertyEditFormPanel extends PromptFormPanelAbstract<ScalarModel>
}
@Override
+ public void renderHead(final IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(OnDomReadyHeaderItem.forScript(
+ String.format("Wicket.Event.publish(Isis.Topic.FOCUS_FIRST_PARAMETER, '%s')", getMarkupId())));
+
+ }
+
+
+ @Override
protected void addParameters() {
final ScalarModel scalarModel = getScalarModel();
http://git-wip-us.apache.org/repos/asf/isis/blob/328a2971/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 9a79e2a..acf22d3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -31,6 +31,8 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
import org.apache.wicket.markup.html.panel.Fragment;
http://git-wip-us.apache.org/repos/asf/isis/blob/328a2971/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index be3313d..779d5db 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -37,6 +37,7 @@ import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -279,6 +280,10 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
if(isModernBrowser()) {
addBootLint(response);
}
+
+ response.render(OnDomReadyHeaderItem.forScript(
+ "Wicket.Event.publish(Isis.Topic.FOCUS_FIRST_PROPERTY)"));
+
}
private void addBootLint(final IHeaderResponse response) {
http://git-wip-us.apache.org/repos/asf/isis/blob/328a2971/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index e59913c..8c91219 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -27,7 +27,8 @@ $(function() {
window.Isis = {
Topic: {
OPEN_IN_NEW_TAB: 'openInNewTab',
- FOCUS_FIRST_ACTION_PARAMETER: 'focusFirstActionParameter'
+ FOCUS_FIRST_PARAMETER: 'focusFirstParameter',
+ FOCUS_FIRST_PROPERTY: 'focusFirstProperty'
},
copyModalShown: false
};
@@ -78,12 +79,18 @@ $(function() {
if(win) { win.focus(); }
});
- Wicket.Event.subscribe(Isis.Topic.FOCUS_FIRST_ACTION_PARAMETER, function(jqEvent, modalWindowId) {
+ Wicket.Event.subscribe(Isis.Topic.FOCUS_FIRST_PARAMETER, function(jqEvent, modalWindowId) {
setTimeout(function() {
$('#'+modalWindowId).find('.inputFormTable.parameters').find('input,textarea,select').filter(':visible:first').focus();
}, 0);
});
+ Wicket.Event.subscribe(Isis.Topic.FOCUS_FIRST_PROPERTY, function(jqEvent) {
+ setTimeout(function() {
+ $(document).find('a.scalarValueEditInline').filter(':visible:first').focus();
+ }, 0);
+ });
+
/* for modal dialogs */
Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_BEFORE_SEND, function(jqEvent, attributes, jqXHR, settings) {
if (attributes.c !== window && !$('#'+attributes.c).hasClass('noVeil')) {