From 9c476d8609b691ba7693effc9eee9ebb3a67ab05 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Wed, 26 May 2021 15:43:32 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03923=20Fix=20up,=20down,=20enter=20key?=
 =?UTF-8?q?=20usage=20in=20ext=20key=20widget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/extkeywidget.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/extkeywidget.js b/js/extkeywidget.js
index 97a1be1c12..5ff5beaeda 100644
--- a/js/extkeywidget.js
+++ b/js/extkeywidget.js
@@ -22,7 +22,7 @@ Selectize.define('custom_itop', function(aOptions) {
 			var iIndex;
 			switch (e.keyCode) {
 				case KEY_BACKSPACE:
-					if (e.keyCode === KEY_BACKSPACE && this.$control_input.val() === '' && !this.$activeItems.length) {
+					if (this.$control_input.val() === '' && !this.$activeItems.length) {
 						iIndex = this.caretPos-1;
 						if (iIndex >= 0 && iIndex < this.items.length) {
 							this.clear(true);
@@ -33,14 +33,14 @@ Selectize.define('custom_itop', function(aOptions) {
 				case KEY_RETURN:
 					if (self.isOpen) {
 						//case nothing selected ->delete selection
-						if (!self.$activeOption || self.currentResults.query == "") {
+						if (!self.$activeOption || (self.currentResults.query === '' && !this.$control_input.val() === '')) {
 							self.deleteSelection(e);
 							self.setValue("");
 							return;
 						}
 					}
 			}
-			return original.apply();
+			return original.apply(this, arguments);
 		};
 	})();
 });
@@ -91,7 +91,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 					if (item.additional_field != undefined) {
 						val = val+'<br><i>'+item.additional_field+'</i>';
 					}
-					return $("<div>").append(val);
+					return $("<div class=\"option\">").append(val);
 				}
 			},
 			valueField: 'value',