Merge branch 'feat/savegame' into alexichi

2 files changed, 21 insertions, 3 deletions

diff --git a/js/craftmine.js b/js/craftmine.js
index 70becec..b87f946 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -9,10 +9,10 @@ data = {
 	icon : "H"
 }
 
-function sendRequest(url, params, callback) {
+function sendRequest(url, params, callback, isFile) {
 	var xhr = new XMLHttpRequest();
 	xhr.open("POST", url);
-	xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+	if(!isFile) xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
 	xhr.onreadystatechange = function() {
 		if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == "200") {
 			var data = "";
@@ -81,5 +81,6 @@ function updateMine() {
 function init() {
 	initCraftMine();
 	changeTab();
+	listSaves();
 	window.setInterval(updateMine, 1000);
 }
diff --git a/js/savegame.js b/js/savegame.js
index 4a08f91..d5a9ba1 100644
--- a/js/savegame.js
+++ b/js/savegame.js
@@ -24,7 +24,9 @@ function loadSave() {
 }
 
 function downloadSave() {
-	window.open("craftmine.php?op=downSave&filename="+getCheckedSave(), "_blank");
+	var filename = getCheckedSave();
+	if(filename == -1) downGame();
+	else window.open("craftmine.php?op=downSave&filename="+getCheckedSave(), "_blank");
 }
 
 function deleteSave() {
@@ -40,3 +42,18 @@ function saveGame() {
 function downGame() {
 	window.open("craftmine.php?op=downSave", "_blank");
 }
+
+function uploadSave() {
+	var selectedFile = document.getElementById("selectedFile");
+	if(selectedFile.files[0].size > 2000000) {
+		showError("File is too big.");
+		return;
+	}
+
+	var form = new FormData(); // Doesn't work with IE < 10 (and Opera Mini), but, as always, who cares?
+	form.append("savefile", selectedFile.files[0]);
+
+	sendRequest("upload.php", form, function(ret) {
+		console.log(ret);
+	}, true);
+}