From d2eef397312d1c142d95c2aef0ff3d5aeee6495a Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Fri, 8 May 2020 16:55:01 +0200
Subject: Fix Closure compiler build, python style.

Move copyToFS into utils.js library included with '--pre-js'.
---
 platform/javascript/engine/engine.js |  6 +++---
 platform/javascript/engine/utils.js  | 18 ------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'platform/javascript/engine')

diff --git a/platform/javascript/engine/engine.js b/platform/javascript/engine/engine.js
index aecc6b9432..d709422abb 100644
--- a/platform/javascript/engine/engine.js
+++ b/platform/javascript/engine/engine.js
@@ -82,7 +82,7 @@ Function('return this')()['Engine'] = (function() {
 		var me = this;
 		return me.init().then(function() {
 			if (!me.rtenv) {
-				reject(new Error('The engine must be initialized before it can be started'));
+				return Promise.reject(new Error('The engine must be initialized before it can be started'));
 			}
 
 			if (!(me.canvas instanceof HTMLCanvasElement)) {
@@ -124,7 +124,7 @@ Function('return this')()['Engine'] = (function() {
 			}
 			return new Promise(function(resolve, reject) {
 				preloader.preloadedFiles.forEach(function(file) {
-					Utils.copyToFS(me.rtenv['FS'], file.path, file.buffer);
+					me.rtenv['copyToFS'](file.path, file.buffer);
 				});
 				preloader.preloadedFiles.length = 0; // Clear memory
 				me.rtenv['callMain'](args);
@@ -217,7 +217,7 @@ Function('return this')()['Engine'] = (function() {
 		if (this.rtenv == null) {
 			throw new Error("Engine must be inited before copying files");
 		}
-		Utils.copyToFS(this.rtenv['FS'], path, buffer);
+		this.rtenv['copyToFS'](path, buffer);
 	}
 
 	// Closure compiler exported engine methods.
diff --git a/platform/javascript/engine/utils.js b/platform/javascript/engine/utils.js
index fdff90a923..0c97b38199 100644
--- a/platform/javascript/engine/utils.js
+++ b/platform/javascript/engine/utils.js
@@ -27,24 +27,6 @@ var Utils = {
 		return instantiateWasm;
 	},
 
-	copyToFS: function(fs, path, buffer) {
-		var p = path.lastIndexOf("/");
-		var dir = "/";
-		if (p > 0) {
-			dir = path.slice(0, path.lastIndexOf("/"));
-		}
-		try {
-			fs.stat(dir);
-		} catch (e) {
-			if (e.errno !== 44) { // 'ENOENT', see https://github.com/emscripten-core/emscripten/blob/master/system/lib/libc/musl/arch/emscripten/bits/errno.h
-				throw e;
-			}
-			fs['mkdirTree'](dir);
-		}
-		// With memory growth, canOwn should be false.
-		fs['writeFile'](path, new Uint8Array(buffer), {'flags': 'wx+'});
-	},
-
 	findCanvas: function() {
 		var nodes = document.getElementsByTagName('canvas');
 		if (nodes.length && nodes[0] instanceof HTMLCanvasElement) {
-- 
cgit v1.2.3