Table: pressing up/down in the filter should move the selection up/down

If the filter is empty, it works. If it is not empty, it has the class
has-text which breaks the equals check.

This functionality broke some versions ago (7.0).

2 files changed, 7 insertions, 7 deletions

diff --git a/eclipse-scout-core/src/table/keystrokes/AbstractTableNavigationKeyStroke.js b/eclipse-scout-core/src/table/keystrokes/AbstractTableNavigationKeyStroke.js
index 01389b0435..25cd65dcef 100644
--- a/eclipse-scout-core/src/table/keystrokes/AbstractTableNavigationKeyStroke.js
+++ b/eclipse-scout-core/src/table/keystrokes/AbstractTableNavigationKeyStroke.js
@@ -31,9 +31,9 @@ export default class AbstractTableNavigationKeyStroke extends KeyStroke {
       return false;
     }
 
-    var activeElement = this.field.$container.activeElement(true),
-      elementType = activeElement.tagName.toLowerCase();
-    if (activeElement.className !== 'table-text-filter' &&
+    var $activeElement = this.field.$container.activeElement();
+    var elementType = $activeElement[0].tagName.toLowerCase();
+    if (!$activeElement.hasClass('table-text-filter') &&
       (elementType === 'textarea' || elementType === 'input') &&
       (!event.originalEvent || (event.originalEvent && !event.originalEvent.smartFieldEvent))) {
       return false;
diff --git a/eclipse-scout-core/src/table/keystrokes/TableFocusFilterFieldKeyStroke.js b/eclipse-scout-core/src/table/keystrokes/TableFocusFilterFieldKeyStroke.js
index d5aee4128d..db006a24c2 100644
--- a/eclipse-scout-core/src/table/keystrokes/TableFocusFilterFieldKeyStroke.js
+++ b/eclipse-scout-core/src/table/keystrokes/TableFocusFilterFieldKeyStroke.js
@@ -47,10 +47,10 @@ export default class TableFocusFilterFieldKeyStroke extends KeyStroke {
       return false;
     }
 
-    var activeElement = this.field.$container.activeElement(true),
-      activeElementType = activeElement.tagName.toLowerCase(),
-      focusOnInputField = (activeElementType === 'textarea' || activeElementType === 'input');
-    if (activeElement.className !== 'table-text-filter' || !focusOnInputField) {
+    var $activeElement = this.field.$container.activeElement();
+    var activeElementType = $activeElement[0].tagName.toLowerCase();
+    var focusOnInputField = (activeElementType === 'textarea' || activeElementType === 'input');
+    if (!$activeElement.hasClass('table-text-filter') || !focusOnInputField) {
       event._$filterInput = $filterInput;
       this._isKeyStrokeInRange(event);
       return true;