Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dranorter 2021-10-06 17:25:34 -04:00
commit d1c0f25bb8
9 changed files with 294 additions and 121 deletions

View file

@ -3570,7 +3570,7 @@
<div id="loadMapData" style="display: none" class="dialog">
<div>
<strong>Load map from</strong>
<button onclick="mapToLoad.click()" data-tip="Load .map file from local disk">local disk</button>
<button onclick="mapToLoad.click()" data-tip="Load .map file from your local disk">machine</button>
<button onclick="loadURL()" data-tip="Load .map file from URL (server should allow CORS)">URL</button>
<button onclick="quickLoad()" data-tip="Load map from browser storage (if saved before)">storage</button>
</div>