Fixed Loading Bug

This commit is contained in:
rufreakde 2019-06-11 17:40:47 +02:00
parent 58f5bf4d4c
commit 865fa6e5d1
2 changed files with 4 additions and 5 deletions

View file

@ -48,7 +48,7 @@ function saveBreadCrumb() {
previousData = previousData.splice(0, half); //HACK - loosing 50% on reaching max... previousData = previousData.splice(0, half); //HACK - loosing 50% on reaching max...
localStorage.removeItem("breadCrumb"); localStorage.removeItem("breadCrumb");
} }
previousData[previousData.length] = JSON.stringify(data); previousData[previousData.length] = data;
localStorage.setItem("breadCrumb", JSON.stringify(previousData)); localStorage.setItem("breadCrumb", JSON.stringify(previousData));
localStorage.setItem("breadCrumbIndex", previousData.length); localStorage.setItem("breadCrumbIndex", previousData.length);
} }
@ -68,11 +68,10 @@ function loadLastBreadCrumb(){
console.time("loadLastBreadCrumb"); console.time("loadLastBreadCrumb");
const crumbToLoad = getPreviousBreadCrumb(); const crumbToLoad = getPreviousBreadCrumb();
if(crumbToLoad){ if(crumbToLoad){
const escape = crumbToLoad.slice(1,crumbToLoad.length-1); const data = crumbToLoad.split("\r\n");
const data = escape.split("\\r\\n");
const mapVersion = data[0].split("|")[0] || data[0]; const mapVersion = data[0].split("|")[0] || data[0];
if (mapVersion === version) { if (mapVersion === version) {
parseLoadedData(data); // parsing problem when loading blob? parseLoadedData(data);
} }
} }
console.timeEnd("loadLastBreadCrumb"); console.timeEnd("loadLastBreadCrumb");

View file

@ -195,6 +195,7 @@ function uploadFile(file, callback) {
const archive = "<a href='https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog' target='_blank'>archived version</a>"; const archive = "<a href='https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog' target='_blank'>archived version</a>";
const parsed = parseFloat(mapVersion); const parsed = parseFloat(mapVersion);
console.timeEnd("loadMap");
let message = "", load = false; let message = "", load = false;
if (isNaN(parsed) || data.length < 26 || !data[5]) { if (isNaN(parsed) || data.length < 26 || !data[5]) {
message = `The file you are trying to load is outdated or not a valid .map file. message = `The file you are trying to load is outdated or not a valid .map file.
@ -390,5 +391,4 @@ function parseLoadedData(data) {
restoreDefaultEvents(); restoreDefaultEvents();
invokeActiveZooming(); invokeActiveZooming();
tip("Map is loaded"); tip("Map is loaded");
console.timeEnd("loadMap");
} }