From e38113662e262287e9465d3870dcf28775155c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gergely=20M=C3=A9sz=C3=A1ros=2C=20Ph=2ED?=
 <goteguru@users.noreply.github.com>
Date: Mon, 16 May 2022 21:21:27 +0200
Subject: [PATCH] New button instead of control+click (namesbases) (#802)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mészáros Gergely <monk@geotronic.hu>
---
 index.html                     |  3 ++-
 modules/ui/namesbase-editor.js | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 6514c754..26d88b1e 100644
--- a/index.html
+++ b/index.html
@@ -3455,7 +3455,8 @@
           <button id="namesbaseAdd" data-tip="Add new namesbase" class="icon-plus"></button>
           <button id="namesbaseDefault" data-tip="Restore default namesbase" class="icon-cancel"></button>
           <button id="namesbaseDownload" data-tip="Download namesbase to PC" class="icon-download"></button>
-          <button id="namesbaseUpload" data-tip="Upload a namesbase from PC, click to override, ctrl+click to extend" class="icon-upload"></button>
+          <button id="namesbaseUpload" data-tip="Upload a namesbase from PC, replacing the current set" class="icon-upload"></button>
+          <button id="namesbaseUploadExtend" data-tip="Upload a namesbase from PC, extending the current set" class="icon-up-circled2"></button>
           <button id="namesbaseCA" data-tip="Find or share custom namesbase on Cartography Assets portal" class="icon-drafting-compass"></button>
           <button id="namesbaseAnalyze" data-tip="Analyze namesbase to get a validity and quality overview" class="icon-flask"></button>
           <button id="namesbaseSpeak" data-tip="Speak the examples. You can change voice and language in options" class="icon-voice"></button>
diff --git a/modules/ui/namesbase-editor.js b/modules/ui/namesbase-editor.js
index 4a0db66d..1e08ad2a 100644
--- a/modules/ui/namesbase-editor.js
+++ b/modules/ui/namesbase-editor.js
@@ -20,14 +20,21 @@ function editNamesbase() {
   document.getElementById("namesbaseAnalyze").addEventListener("click", analyzeNamesbase);
   document.getElementById("namesbaseDefault").addEventListener("click", namesbaseRestoreDefault);
   document.getElementById("namesbaseDownload").addEventListener("click", namesbaseDownload);
+
+  const uploader = document.getElementById("namesbaseToLoad");
   document.getElementById("namesbaseUpload").addEventListener("click", () => {
-    const uploader = document.getElementById("namesbaseToLoad");
-    uploader.dataset.override = event.ctrlKey ? "no" : "yes";
+    uploader.addEventListener("change", function (event) {
+      uploadFile(event.target, d => namesbaseUpload(d, true));
+    }, { once: true });
     uploader.click();
   });
-  document.getElementById("namesbaseToLoad").addEventListener("change", function (ev) {
-    uploadFile(this, d => namesbaseUpload(d, ev.target.dataset.override === "yes"));
+  document.getElementById("namesbaseUploadExtend").addEventListener("click", () => {
+    uploader.addEventListener("change", function (event) {
+      uploadFile(event.target, d => namesbaseUpload(d, false));
+    }, { once: true });
+    uploader.click();
   });
+
   document.getElementById("namesbaseCA").addEventListener("click", () => {
     openURL("https://cartographyassets.com/asset-category/specific-assets/azgaars-generator/namebases/");
   });