From fd4e1b98492673c5caaa4a69d0e7471f9d3fb3cd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 19 Jun 2020 14:53:26 +0200
Subject: [PATCH] Fix tag prompt shortcuts

---
 www/common/common-interface.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 4eba3755c..870b33c74 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -356,11 +356,15 @@ define([
         var $cancel = findCancelButton(tagger).click(function (e) {
             close(null, e);
         });
-        listener = listenForKeys(function () {
-            $ok.click();
-        }, function () {
-            $cancel.click();
-        }, tagger);
+        $(tagger).on('keydown', function (e) {
+            if (e.which === 27) {
+                $cancel.click();
+                return;
+            }
+            if (e.which === 13) {
+                $ok.click();
+            }
+        });
 
         $(tagger).on('click submit', function (e) {
             e.stopPropagation();