From 88564bbf07e8541dfaaa66575b91f94770d385c7 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Tue, 7 May 2019 10:35:58 +0300
Subject: [PATCH] Fix Show More when choosing custom credentials

---
 keepassxc-browser/content/define.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/keepassxc-browser/content/define.js b/keepassxc-browser/content/define.js
index 4cf67d1..33cd2b4 100644
--- a/keepassxc-browser/content/define.js
+++ b/keepassxc-browser/content/define.js
@@ -145,7 +145,7 @@ kpxcDefine.markAllUsernameFields = function(chooser) {
     kpxcDefine.markFields(chooser, kpxcFields.inputQueryPattern);
 };
 
-kpxcDefine.markAllPasswordFields = function(chooser, more) {
+kpxcDefine.markAllPasswordFields = function(chooser, more = false) {
     kpxcDefine.eventFieldClick = function(e, elem) {
         const field = elem || e.currentTarget;
         kpxcDefine.selection.password = field.getAttribute('data-kpxc-id');
@@ -183,7 +183,7 @@ kpxcDefine.markFields = function(chooser, pattern) {
 
     for (const i of inputs) {
         if (kpxcDefine.isFieldSelected(i.getAttribute('data-kpxc-id'))) {
-            return true;
+            continue;
         }
 
         if (kpxcFields.isVisible(i)) {
@@ -326,6 +326,10 @@ kpxcDefine.confirm = function() {
 };
 
 kpxcDefine.discard = function() {
+    if (!$('#kpxcDefine-btn-discard')) {
+        return;
+    }
+
     const location = kpxc.getDocumentLocation();
     delete kpxc.settings['defined-custom-fields'][location];