From a0c0b7b19550016f36cbbb3df6988c7649f4001c Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Wed, 28 Apr 2021 23:37:15 +0200
Subject: [PATCH] cancel button in the entry selection view

---
 app/scripts/locales/base.json                 |  1 -
 app/scripts/views/select/select-entry-view.js | 13 +++++++------
 app/styles/areas/_select-entry.scss           |  5 +++++
 app/templates/select/select-entry.hbs         |  4 +++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json
index 9544763b..4da3501e 100644
--- a/app/scripts/locales/base.json
+++ b/app/scripts/locales/base.json
@@ -804,7 +804,6 @@
 
     "selectEntryHeader": "Select entry",
     "selectEntryEnterHint": "use the highlighted entry",
-    "selectEntryEscHint": "cancel",
     "selectEntryTypingHint": "Start typing to filter",
     "selectEntryContains": "Contains text",
     "selectEntrySubdomains": "Subdomains"
diff --git a/app/scripts/views/select/select-entry-view.js b/app/scripts/views/select/select-entry-view.js
index 8360624e..5d8ed3cf 100644
--- a/app/scripts/views/select/select-entry-view.js
+++ b/app/scripts/views/select/select-entry-view.js
@@ -25,7 +25,8 @@ class SelectEntryView extends View {
         'click .select-entry__header-filter-clear': 'clearFilterText',
         'click .select-entry__item': 'itemClicked',
         'contextmenu .select-entry__item': 'itemRightClicked',
-        'click .select-entry__filter': 'filterClicked'
+        'click .select-entry__filter': 'filterClicked',
+        'click .select-entry__cancel-btn': 'cancelClicked'
     };
 
     result = null;
@@ -158,11 +159,7 @@ class SelectEntryView extends View {
     }
 
     escPressed() {
-        if (this.model.filter.text) {
-            this.clearFilterText();
-        } else {
-            this.cancelAndClose();
-        }
+        this.cancelAndClose();
     }
 
     enterPressed() {
@@ -394,6 +391,10 @@ class SelectEntryView extends View {
 
         this.render();
     }
+
+    cancelClicked() {
+        this.cancelAndClose();
+    }
 }
 
 Object.assign(SelectEntryView.prototype, Scrollable);
diff --git a/app/styles/areas/_select-entry.scss b/app/styles/areas/_select-entry.scss
index fd1cadce..f21ad289 100644
--- a/app/styles/areas/_select-entry.scss
+++ b/app/styles/areas/_select-entry.scss
@@ -144,4 +144,9 @@
             padding-left: 0;
         }
     }
+    &__buttons {
+        display: flex;
+        justify-content: flex-end;
+        margin-top: $small-spacing;
+    }
 }
diff --git a/app/templates/select/select-entry.hbs b/app/templates/select/select-entry.hbs
index 55594072..8d282ab9 100644
--- a/app/templates/select/select-entry.hbs
+++ b/app/templates/select/select-entry.hbs
@@ -15,7 +15,6 @@
                 <div class="select-entry__hint-text"><span class="shortcut">{{shiftSymbol}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintShift'}}</div>
             {{else}}
                 <div class="select-entry__hint-text"><span class="shortcut">{{keyEnter}}</span>: {{res 'selectEntryEnterHint'}}</div>
-                <div class="select-entry__hint-text"><span class="shortcut">{{keyEsc}}</span>: {{res 'selectEntryEscHint'}}</div>
                 <div class="select-entry__hint-text">{{res 'selectEntryTypingHint'}}</div>
             {{/if}}
         </div>
@@ -45,4 +44,7 @@
         </div>
         <div class="scroller__bar-wrapper"><div class="scroller__bar"></div></div>
     </div>
+    <div class="select-entry__buttons">
+        <button class="btn btn-error select-entry__cancel-btn">{{res 'alertCancel'}} ({{res 'keyEsc'}})</button>
+    </div>
 </div>