From 5eb3e864fba893a8f1663b9a22cf32fa32f2d856 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Fri, 6 Aug 2021 18:05:32 -0500
Subject: [PATCH] fixed file upload after esbuild refactor

---
 electron.html              | 3 ---
 index.html                 | 3 ---
 src/common/emu.ts          | 2 +-
 src/common/wasmplatform.ts | 6 ++----
 src/ide/ui.ts              | 7 +++++--
 test/cli/testplatforms.js  | 3 ++-
 6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/electron.html b/electron.html
index f3867117..779480d2 100644
--- a/electron.html
+++ b/electron.html
@@ -14,9 +14,6 @@ body {
 </head>
 <body>
 
-<!-- for file upload -->
-<input type="file" id="uploadFileElem" multiple accept="*" style="display:none" onchange="handleFileUpload(this.files)">
-
 <div id="controls_top" class="disable-select">
  <div id="controls_dynamic" style="visibility:hidden">
   <!-- main menu -->
diff --git a/index.html b/index.html
index b4e56612..b7162bc8 100644
--- a/index.html
+++ b/index.html
@@ -36,9 +36,6 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
 </head>
 <body>
 
-<!-- for file upload -->
-<input type="file" id="uploadFileElem" multiple accept="*" style="display:none" onchange="handleFileUpload(this.files)">
-
 <div id="controls_top" class="disable-select">
  <div id="controls_dynamic" style="visibility:hidden">
   <!-- main menu -->
diff --git a/src/common/emu.ts b/src/common/emu.ts
index e9adfcb2..c6bbd3d7 100644
--- a/src/common/emu.ts
+++ b/src/common/emu.ts
@@ -256,7 +256,7 @@ export class AnimationTimer {
   scheduleFrame(msec:number) {
     var fn = (timestamp) => {
       try {
-        this.nextFrame(timestamp*1000);
+        this.nextFrame(timestamp);
       } catch (e) {
         this.running = false;
         this.pulsing = false;
diff --git a/src/common/wasmplatform.ts b/src/common/wasmplatform.ts
index ab5ed096..c7b1afb6 100644
--- a/src/common/wasmplatform.ts
+++ b/src/common/wasmplatform.ts
@@ -247,10 +247,8 @@ export abstract class BaseWASIMachine extends BaseWASMMachine {
     return buffer.length;
   }
   async loadWASM() {
-    await loadScript('node_modules/@wasmer/wasi/lib/index.iife.js'); //TODO: require('@wasmer/wasi');
-    await loadScript('node_modules/@wasmer/wasmfs/lib/index.iife.js'); //TODO: require('@wasmer/wasi');
-    let WASI = window['WASI'];
-    let WasmFs = window['WasmFs'];
+    let WASI = await import('@wasmer/wasi');
+    let WasmFs = await import('@wasmer/wasmfs');
     this.wasmFs = new WasmFs.WasmFs();
     let bindings = WASI.WASI.defaultBindings;
     bindings.fs = this.wasmFs.fs;
diff --git a/src/ide/ui.ts b/src/ide/ui.ts
index 3d487b6d..7fff0a09 100644
--- a/src/ide/ui.ts
+++ b/src/ide/ui.ts
@@ -484,11 +484,14 @@ function _createNewFile(e) {
 }
 
 function _uploadNewFile(e) {
-  $("#uploadFileElem").click();
+  const uploadFileElem = $(`<input type="file" multiple accept="*" style="display:none">`);
+  const file = uploadFileElem[0] as HTMLInputElement;
+  uploadFileElem.change((e) => { handleFileUpload(file.files) });
+  uploadFileElem.click();
 }
 
 // called from index.html
-function handleFileUpload(files: File[]) {
+function handleFileUpload(files: FileList) {
   console.log(files);
   var index = 0;
   function uploadNextFile() {
diff --git a/test/cli/testplatforms.js b/test/cli/testplatforms.js
index e40cb340..fcc5ee7a 100644
--- a/test/cli/testplatforms.js
+++ b/test/cli/testplatforms.js
@@ -41,7 +41,8 @@ var _c64 = require('gen/platform/c64.js');
 var _vectrex = require('gen/platform/vectrex.js');
 var _zx = require('gen/platform/zx.js');
 var _atari8 = require('gen/platform/atari8.js');
-
+var util = require('gen/common/util.js');
+util.loadScript = function(s) { console.log('tried to load',s); } // for vcs
 
 //
 
