From 39dad45b473cbce22853254362df871e97403410 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Sat, 21 Dec 2019 12:10:08 -0600
Subject: [PATCH] added back installErrorHandler

---
 src/ide/ui.ts       | 24 +++++++++++++++++++++++-
 src/platform/c64.ts | 15 ++-------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/ide/ui.ts b/src/ide/ui.ts
index b1c88017..f833f02d 100644
--- a/src/ide/ui.ts
+++ b/src/ide/ui.ts
@@ -1717,7 +1717,27 @@ var qs = (function (a : string[]) {
     return b;
 })(window.location.search.substr(1).split('&'));
 
+function globalErrorHandler(msgevent) {
+  var msg = (msgevent.message || msgevent.error || msgevent)+"";
+  // storage quota full? (Chrome) try to expand it
+  if (msg.indexOf("QuotaExceededError") >= 0) {
+    requestPersistPermission();
+  } else {
+    showErrorAlert([{msg:msg,line:0}]);
+  }
+}
+
+// catch errors
+function installErrorHandler() {
+  window.addEventListener('error', globalErrorHandler);
+}
+  
+function uninstallErrorHandler() {
+  window.removeEventListener('error', globalErrorHandler);
+}
+
 function gotoNewLocation(replaceHistory? : boolean) {
+  uninstallErrorHandler();
   if (replaceHistory)
     window.location.replace("?" + $.param(qs));
   else
@@ -1809,6 +1829,8 @@ async function startPlatform() {
   }
   // start platform and load file
   replaceURLState();
+  installErrorHandler();
+  installGAHooks();
   await platform.start();
   await loadBIOSFromProject();
   await initProject();
@@ -1817,7 +1839,6 @@ async function startPlatform() {
   updateSelector();
   addPageFocusHandlers();
   showInstructions();
-  installGAHooks();
   revealTopBar();
 }
 
@@ -1994,6 +2015,7 @@ function _switchToHTTPS() {
 function redirectToHTTPS() {
   if (window.location.protocol == 'http:' && window.location.host == '8bitworkshop.com') {
     if (shouldRedirectHTTPS()) {
+      uninstallErrorHandler();
       window.location.replace(window.location.href.replace(/^http:/, 'https:'));
     } else {
       $("#item_switch_https").click(_switchToHTTPS).show();
diff --git a/src/platform/c64.ts b/src/platform/c64.ts
index 8071e2e5..6c7d90f0 100644
--- a/src/platform/c64.ts
+++ b/src/platform/c64.ts
@@ -48,17 +48,6 @@ class C64WASMPlatform extends Base6502MachinePlatform<WASMMachine> implements Pl
   getMemoryMap()        { return C64_MEMORY_MAP; }
 }
 
-/*
-class C64WASMPlatform extends BaseWASMPlatform implements Platform {
-
-  prefix = 'c64';
-
-  getPresets() { return C64_PRESETS; }
-  getToolForFilename = getToolForFilename_6502;
-  getOpcodeMetadata = getOpcodeMetadata_6502;
-  getDefaultExtension() { return ".c"; };
-}
-*/
-
-PLATFORMS['c64'] = C64Platform;
+PLATFORMS['c64'] = C64WASMPlatform;
 PLATFORMS['c64.wasm'] = C64WASMPlatform;
+PLATFORMS['c64.js'] = C64Platform;