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 2014/07/24 08:21:38 UTC
[4/9] git commit: ISIS-825, ISIS-544: fix for auto-focus of BigDecimal,
also for date fields.
ISIS-825, ISIS-544: fix for auto-focus of BigDecimal, also for date fields.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/42dc991e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/42dc991e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/42dc991e
Branch: refs/heads/prepare/isis-1.6.0-RC3
Commit: 42dc991eeec5e7787270c9a8ac140f2b40a67dc7
Parents: a58542e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 24 06:24:44 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 24 06:29:20 2014 +0100
----------------------------------------------------------------------
.../components/widgets/cssmenu/ActionLinkFactoryAbstract.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/42dc991e/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index 4b09951..945bd27 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -130,7 +130,11 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
final Component actionPanelFirstParam = actionPanel.visitChildren(new IVisitor<Component, Component>() {
@Override
public void component(Component object, IVisit<Component> visit) {
- if (object instanceof FormComponent) {
+ if (object instanceof FormComponent &&
+ !"scalarIfCompact".equals(object.getId()) &&
+ object.getOutputMarkupId()) {
+ // there are components for 'compact' and 'regular'; we want the 'regular' one
+ // also double check that has outputMarkupId enabled (prereq for setting focus)
visit.stop(object);
}
}