More fixes to combo-lookup asynchronous behaviour

tvannini · Apr 20, 2019 · 155189e · 155189e
1 parent ed6b1b0
commit 155189e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/htdocs/js/env.js b/htdocs/js/env.js
@@ -897,11 +897,11 @@ o2jse.conf.setProfiling = function(profLevel) {
  */
 o2jse.conf.addKey = function(keyCode, shiftBtn, ctrlBtn, altBtn, actCode) {
 
-    o2jse.keyList[o2jse.keyList.length] = {code  : keyCode,
+    o2jse.keyList.push({code  : keyCode,
-                                           shift : shiftBtn,
+                        shift : shiftBtn,
-                                           ctrl  : ctrlBtn,
+                        ctrl  : ctrlBtn,
-                                           alt   : altBtn,
+                        alt   : altBtn,
-                                           exe   : actCode};
+                        exe   : actCode});
 
     };
 
@@ -5408,6 +5408,7 @@ o2jse.lu.k = function(eventObj, targetObj) {
                     targetObj     = list;
                     list.focus();
                     }
+                stdEvent.stop();
                 }
             }
         // _________________________________________________ Event fired on items list ___
@@ -5481,7 +5482,8 @@ o2jse.lu.k = function(eventObj, targetObj) {
             }
         // _______________________________________________________ Event fired on list ___
         else {
-            o2jse.lu.m(eventObj, targetObj.selectedItem);
+            targetObj.descField.focus();
+            o2jse.lu.m(eventObj, targetObj.selectedItem, true);
             }
         }
     // _______________________________________________________________________ * TAB * ___
@@ -5517,10 +5519,18 @@ o2jse.lu.k = function(eventObj, targetObj) {
         }
     // _______________________________________________________________________ * ESC * ___
     else if (stdEvent.keyCode == KEY_ESC) {
-        if (targetObj.listObj) {
+        if (targetObj.nodeName.toLowerCase() == "input") {
-            o2jse.lu.e(targetObj, stdEvent);
+            if (targetObj.listObj) {
+                o2jse.lu.e(targetObj, stdEvent);
+                stdEvent.stop();
+                targetObj.inEdit = false;
+                return true;
+                }
+            }
+        else {
+            o2jse.lu.e(targetObj.descField, stdEvent);
             stdEvent.stop();
-            targetObj.inEdit = false;
+            targetObj.descField.inEdit = false;
             return true;
             }
         }
@@ -5940,7 +5950,7 @@ o2jse.lu.getList = function(ctrlObj, listText) {
         o2jse.removeEl(o2jse.waitObj);
         delete o2jse.waitObj;
         }
-    var itemsList
+    var itemsList;
     // _________________________________________________________ Fired from desc-field ___
     if (ctrlObj.listObj) {
         itemsList = ctrlObj.listObj.childNodes[0];

diff --git a/jxrnt.php b/jxrnt.php
@@ -44,7 +44,7 @@
  *
  * @global string $jxbuilt
  */
-$jxbuilt = "20190417";
+$jxbuilt = "20190420";
 
 /**
  * Start execution time