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 2021/05/31 08:09:42 UTC
[isis] branch master updated: ISIS-2704: fixes javascript to check
which element is found first
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new af3c8ce ISIS-2704: fixes javascript to check which element is found first
af3c8ce is described below
commit af3c8ce9deeacb4e10c201d882e3857fee345084
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon May 31 09:09:27 2021 +0100
ISIS-2704: fixes javascript to check which element is found first
---
.../isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index 6cda836..8083257 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -105,8 +105,13 @@ $(function() {
Wicket.Event.subscribe(Isis.Topic.FOCUS_FIRST_PARAMETER, function(jqEvent, elementId) {
setTimeout(function() {
- $('#'+elementId).find('.inputFormTable.parameters').find('input,textarea,div.cbx').filter(':visible:first').focus();
- $('#'+elementId).find('.inputFormTable.parameters').find('select').filter(':visible:first').select2('open').select2('close');
+ let el = $('#'+elementId).find('.inputFormTable.parameters').find('input,textarea,div.cbx,select').filter(':visible:first');
+ let x = $(el).prop('nodeName').toLowerCase()
+ if(x === 'input') {
+ el.focus();
+ } else {
+ el.select2('open').select2('close');
+ }
}, 0);
});