From 1f7d4c4d0ee8eba0a1d8084019269a45dfa76be4 Mon Sep 17 00:00:00 2001
From: eska
Date: Thu, 12 Jan 2017 14:14:40 +0100
Subject: Improve usability and style in web export presentation

 - Check for WebGL support, don't load if unsupported
 - Check for IndexedDB support
 - Make canvas support check message visible
 - Colored debug output for warnings and errors
 - Make it obvious status can be closed by clicking
 - Don't use status to display non-critical errors
 - Limit output message count
 - Add clear output button
 - Fix setting total memory
---
 platform/javascript/javascript_main.cpp | 42 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'platform/javascript/javascript_main.cpp')

diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
index 586ccc9b4..99b16b2b9 100644
--- a/platform/javascript/javascript_main.cpp
+++ b/platform/javascript/javascript_main.cpp
@@ -140,10 +140,9 @@ static void _godot_draw(void) {
 
 extern "C" {
 
-void main_after_fs_sync(int value) {
+void main_after_fs_sync() {
 
 	start_step=1;
-	printf("FS SYNCHED!\n");
 }
 
 }
@@ -178,26 +177,25 @@ int main(int argc, char *argv[]) {
 	glutDisplayFunc(_godot_draw);
    //glutSpecialFunc(gears_special);
 
-
-
-	 //mount persistent filesystem
-	 EM_ASM(
-		 FS.mkdir('/userfs');
-		 FS.mount(IDBFS, {}, '/userfs');
-
-
-
-		 // sync from persisted state into memory and then
-		 // run the 'test' function
-		 FS.syncfs(true, function (err) {
-			 assert(!err);
-			 console.log("done syncinc!");
-			 _after_sync_cb = Module.cwrap('main_after_fs_sync', 'void',['number']);
-			 _after_sync_cb(0);
-
-		 });
-
-	  );
+	//mount persistent file system
+	EM_ASM(
+		FS.mkdir('/userfs');
+		FS.mount(IDBFS, {}, '/userfs');
+
+		// sync from persistent state into memory and then
+		// run the 'main_after_fs_sync' function
+		FS.syncfs(true, function(err) {
+
+			if (err) {
+				Module.setStatus('Failed to load persistent data\nPlease allow (third-party) cookies');
+				Module.printErr('Failed to populate IDB file system: ' + err.message);
+				Module.exit();
+			} else {
+				Module.print('Successfully populated IDB file system');
+				ccall('main_after_fs_sync', 'void', []);
+			}
+		});
+	);
 
 	glutMainLoop();
 
-- 
cgit v1.2.3-70-g09d2