backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-19 10:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: showUploadMessage function not called correctly for isUpdated case

Browse source
This commit is contained in:
Azgaar 2024-08-26 03:53:35 +02:00
parent 6000f82ac9
commit 85e868a351
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/io/load.js
View file

@ -119,7 +119,7 @@ function uploadMap(file, callback) {
const isOutdated = compareVersions(mapVersion, version).isOlder; const isOutdated = compareVersions(mapVersion, version).isOlder;
if (isInvalid) return showUploadMessage("invalid", mapData, mapVersion); if (isInvalid) return showUploadMessage("invalid", mapData, mapVersion);
if (isUpdated) return parseLoadedData("updated", mapData, mapVersion); if (isUpdated) return showUploadMessage("updated", mapData, mapVersion);
if (isAncient) return showUploadMessage("ancient", mapData, mapVersion); if (isAncient) return showUploadMessage("ancient", mapData, mapVersion);
if (isNewer) return showUploadMessage("newer", mapData, mapVersion); if (isNewer) return showUploadMessage("newer", mapData, mapVersion);
if (isOutdated) return showUploadMessage("outdated", mapData, mapVersion); if (isOutdated) return showUploadMessage("outdated", mapData, mapVersion);
@ -169,8 +169,8 @@ async function parseLoadedResult(result) {
const decoded = isDelimited ? resultAsString : decodeURIComponent(atob(resultAsString)); const decoded = isDelimited ? resultAsString : decodeURIComponent(atob(resultAsString));
const mapData = decoded.split("\r\n"); const mapData = decoded.split("\r\n");
const mapVersion = mapData[0].split("|")[0] || mapData[0]; const mapVersionString = mapData[0].split("|")[0] || mapData[0] || "";
return [mapData, mapVersion]; return [mapData, mapVersionString];
} catch (error) { } catch (error) {
// map file can be compressed with gzip // map file can be compressed with gzip
const uncompressedData = await uncompress(result); const uncompressedData = await uncompress(result);

8
versioning.js
View file

@ -9,10 +9,10 @@ const version = "1.100.00"; // generator version, update each time
if (loadingScreenVersion) loadingScreenVersion.innerText = `v${version}`; if (loadingScreenVersion) loadingScreenVersion.innerText = `v${version}`;
const storedVersion = localStorage.getItem("version"); const storedVersion = localStorage.getItem("version");
if (isOutdated(storedVersion)) await clearCache(); if (isOutdated(storedVersion)) {
await clearCache();
const showUpdate = storedVersion < versionNumber; setTimeout(showUpdateWindow, 6000);
if (showUpdate) setTimeout(showUpdateWindow, 6000); }
function showUpdateWindow() { function showUpdateWindow() {
const changelog = "https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog"; const changelog = "https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog";