final fixes to merge

dip000 · Feb 20, 2022 · 0dc2819 · 0dc2819
1 parent 01afdb6
commit 0dc2819
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/MapBuilderForWeb/MapBuilder.js b/MapBuilderForWeb/MapBuilder.js
@@ -414,12 +414,17 @@ function Point(x, y){
 /////////////////////////// UPLOAD /////////////////////////////////////////////////
 
 	function upload(uploadString){
-		let mapsAndShapesString = uploadString.split("$");
-		let mapsString = mapsAndShapesString[0].split("&");
-		let shapesString = mapsAndShapesString[1].split("&");
-
-		uploadShapes(shapesString);
-		uploadMaps(mapsString);
+		let mapsAndShapesString, mapsString, shapesString;
+		try{
+			mapsAndShapesString = uploadString.split("$");
+			mapsString = mapsAndShapesString[0].split("&");
+			shapesString = mapsAndShapesString[1].split("&");
+		} catch{ alert("Couldn't parse. File corrupted"); return; }
+
+		try{ uploadShapes(shapesString);} catch{ alert("Shapes couldn't be loaded"); return;}
+
+		try{ uploadMaps(mapsString);} catch{ alert("Maps couldn't be loaded"); return;}
+
 		ChangeItem(0);
 	}
 

diff --git a/MapBuilderForWeb/MultimapMechanics.js b/MapBuilderForWeb/MultimapMechanics.js
@@ -173,7 +173,9 @@
 			document.querySelector('input[type=file]').value = "";
 		}
 
-		try{ reader.readAsText( file ); } catch{}
+		if(file){
+			try{ reader.readAsText( file ); } catch{ alert("This file Cannot be uploaded"); }
+		}
 	}
 
 	function downloadManager(){