You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/20 12:24:17 UTC
[isis] branch master updated: ISIS-3054: disable client side Isis.Topic.CLOSE_SELECT2
This is an automated email from the ASF dual-hosted git repository.
ahuber 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 f06498d108 ISIS-3054: disable client side Isis.Topic.CLOSE_SELECT2
f06498d108 is described below
commit f06498d10888a3436fcad6c0158164bc461f3189
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 20 14:24:09 2022 +0200
ISIS-3054: disable client side Isis.Topic.CLOSE_SELECT2
---
.../common/viewer/js/jquery.isis.wicket.viewer.js | 23 ++++++++--------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js
index c2fb41f949..7c9a58cce0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js
@@ -88,18 +88,18 @@ $(function() {
Wicket.Event.subscribe(Isis.Topic.OPEN_SELECT2, function(jqEvent, panelId) {
setTimeout(function() {
var $panel = $('#'+panelId);
- console.log($panel);
+ //console.log('Isis.Topic.OPEN_SELECT2: panelId=' + panelId);
$($panel).find('select').select2('open');
-// $($panel).find('select').filter(':visible:first').focus();
+ //$($panel).find('select').filter(':visible:first').focus();
}, 0);
});
Wicket.Event.subscribe(Isis.Topic.CLOSE_SELECT2, function(jqEvent, panelId) {
setTimeout(function() {
var $panel = $('#'+panelId);
- console.log($panel);
- $($panel).find('select').select2('close');
- $($panel).find('select').filter(':visible:first').focus();
+ //console.log('Isis.Topic.CLOSE_SELECT2: panelId=' + panelId);
+ //$($panel).find('select').select2('close');
+ //$($panel).find('select').filter(':visible:first').focus();
}, 0);
});
@@ -108,6 +108,9 @@ $(function() {
let el = $('#'+elementId).find('.inputFormTable.parameters')
.find('input,textarea,div.cbx,select').filter(':visible:first');
if(el) {
+
+ //console.log('Isis.Topic.FOCUS_FIRST_PARAMETER: elementId=' + elementId);
+
let elNodeName = $(el).prop('nodeName')
if (elNodeName) {
let x = elNodeName.toLowerCase()
@@ -216,16 +219,6 @@ $(function() {
event.stopImmediatePropagation();
});
-/*
- $('.editing .editable').parent().hover(function () {
- var inputEl = $(this).find("> .editable")
- $(inputEl).css({cursor: 'pointer'})
- },function () {
- var inputEl = $(this).find("> .editable")
- $(inputEl).css({cursor: 'auto'})
- });
-*/
-
/*
Adapted from https://bootstrap-menu.com/detail-basic-hover.html
Ignoring mouseleave events if hovering over a popover that belongs to a menuitem.