From eb8a7a9d3674340bd59bf21b853430463b9afdc0 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Tue, 30 Mar 2021 18:00:00 +0000
Subject: [PATCH] Allow Return key to accept dialog when loading no-go areas or
 track as route

After ca53080e added Return key handling to the "Delete route" dialog, only
the "Load no-go areas" and "Load track as route" dialogs were still missing
similar functionality.

The implementation is based on 2a431932.

Test Plan:
- Open "Load no-go areas" or "Load track as route" dialog.
- Press Space or Return to open file dialog, choose file,
  Tab out of file input and press Return to confirm modal.
- Notice not having to Tab to the respective confirmation button.
---
 index.html                        | 4 ++--
 js/plugin/RouteLoaderConverter.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 8625654..88dc7e3 100644
--- a/index.html
+++ b/index.html
@@ -680,7 +680,7 @@
                             Close
                         </button>
                         <button
-                            type="button"
+                            type="submit"
                             class="btn btn-primary"
                             form="loadedittrackForm"
                             data-i18n="trackasroute.title"
@@ -800,7 +800,7 @@
                         </button>
 
                         <button
-                            type="button"
+                            type="submit"
                             class="btn btn-primary"
                             form="loadNogosForm"
                             data-i18n="loadNogos.load"
diff --git a/js/plugin/RouteLoaderConverter.js b/js/plugin/RouteLoaderConverter.js
index d719853..53967c7 100644
--- a/js/plugin/RouteLoaderConverter.js
+++ b/js/plugin/RouteLoaderConverter.js
@@ -191,7 +191,8 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
                 }.bind(this)
             );
 
-            L.DomUtil.get('submitLoadEditTrack').onclick = L.bind(function () {
+            L.DomUtil.get('submitLoadEditTrack').onclick = L.bind(function (e) {
+                e.preventDefault(); // prevent page reload on form submission
                 this._closeCanceled = false;
                 this.onBusyChanged(true);
                 if (this._testLayer.getLayers().length > 0) {