From 3221d43cdc7282dc443df1d5e4504804aa8da01f Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Fri, 6 Jul 2018 18:12:58 -0500
Subject: [PATCH] cache result of failed web load; fixed tour

---
 doc/notes.txt  |  2 +-
 index.html     |  6 +++---
 pixels.html    |  2 +-
 src/project.ts | 45 +++++++++++++++++++++++++++------------------
 src/ui.js      | 24 ++++++++++++++++--------
 src/views.ts   |  3 +--
 6 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/doc/notes.txt b/doc/notes.txt
index b5054c7c..b63a9613 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -22,7 +22,6 @@ TODO:
 - run apple CPU until boot
 - better disasm/listing selection
 - disasm for z80
-- projects w/ include files
 - watchpoints
 - breakpoints
 - debug inspector
@@ -45,6 +44,7 @@ TODO:
 - more UI tests
 - base-36 encoding for LZG
 - disassembler for uploaded ROMs
+- show tool-specific (readonly) include files
 
 
 WEB WORKER FORMAT
diff --git a/index.html b/index.html
index c5d2a890..7b492e99 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
 
 <div id="controls_top">
     <span class="dropdown">
-      <a class="btn btn-secondary dropdown-toggle" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <a class="btn btn-secondary dropdown-toggle" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Menu">
         &#9776; <span class="caret"></span>
       </a>
       <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@@ -84,11 +84,11 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
     </ul>
   </span>
 
-  <select id="preset_select" name="">
+  <select id="preset_select" name="" title="Project Select">
   </select>
 
   <span class="dropdown">
-    <a class="btn btn-secondary dropdown-toggle" id="windowMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <a class="btn btn-secondary dropdown-toggle" id="windowMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Window Select">
       &#9775; <span class="caret"></span>
     </a>
     <ul class="dropdown-menu" aria-labelledby="windowMenuButton" id="windowMenuList">
diff --git a/pixels.html b/pixels.html
index 50d61698..f5c44aea 100644
--- a/pixels.html
+++ b/pixels.html
@@ -35,7 +35,7 @@ body {
 <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
 <script src="bootstrap/js/bootstrap.min.js"></script>
 <script src="FileSaver.js/FileSaver.min.js"></script>
-<script src="src/util.js"></script>
+<script src="gen/util.js"></script>
 <script src="src/pixed/pixeleditor.js"></script>
 
 <script>
diff --git a/src/project.ts b/src/project.ts
index 62f2c812..e030758a 100644
--- a/src/project.ts
+++ b/src/project.ts
@@ -185,40 +185,49 @@ export class CodeProject {
   
   // TODO: get local file as well as presets?  
   loadFiles(paths:string[], callback:LoadFilesCallback) {
-    var result = [];
+    var result : Dependency[] = [];
+    function addResult(path, data) {
+      result.push({
+        path:path,
+        filename:getFilenameForPath(path),
+        data:data
+      });
+    }
     var loadNext = () => {
       var path = paths.shift();
       if (!path) {
-        callback(null, result); // TODO?
+        // finished loading all files; return result
+        callback(null, result);
       } else {
+        // look in store
         this.store.getItem(path, (err, value) => {
-          if (err) {
+          if (err) { // err fetching from store
             callback(err, result);
-          } else if (value) {
-            result.push({
-              path:path,
-              filename:getFilenameForPath(path),
-              data:value
-            });
+          } else if (value) { // found in store?
             this.filedata[path] = value;
+            addResult(path, value);
             loadNext();
-          } else {
+          } else if (path in this.filedata) { // found in cache?
+            var data = this.filedata[path];
+            if (data)
+              addResult(path, data);
+            loadNext();
+          } else { // found on remote fetch?
             var webpath = "presets/" + this.platform_id + "/" + path;
             if (this.platform_id == 'vcs' && path.indexOf('.') <= 0)
               webpath += ".a"; // legacy stuff
-            // TODO: cache files
             this.callbackGetRemote( webpath, (text:string) => {
               console.log("GET",webpath,text.length,'bytes');
-              result.push({
-                path:path,
-                filename:getFilenameForPath(path),
-                data:text
-              });
               this.filedata[path] = text;
+              addResult(path, text);
               loadNext();
             }, 'text')
-            .fail(function() {
-              callback("Could not load preset " + path, result);
+            .fail( (err:XMLHttpRequest) => {
+              console.log("Could not load preset", path, err);
+              // only cache result if status is 404 (not found)
+              if (err.status && err.status == 404)
+                this.filedata[path] = null;
+              loadNext();
             });
           }
         });
diff --git a/src/ui.js b/src/ui.js
index eb17597c..eb364661 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -688,15 +688,12 @@ function showWelcomeMessage() {
   if (!localStorage.getItem("8bitworkshop.hello")) {
     // Instance the tour
     var is_vcs = platform_id == 'vcs';
-    var tour = new Tour({
-      autoscroll:false,
-      //storage:false,
-      steps: [
+    var steps = [
         {
-          element: "#editor",
+          element: "#workspace",
           title: "Welcome to 8bitworkshop!",
           content: is_vcs ? "Type your 6502 assembly code into the editor, and it'll be assembled in real-time. All changes are saved to browser local storage."
-                          : "Type your C source code into the editor, and it'll be compiled in real-time. All changes are saved to browser local storage."
+                          : "Type your source code into the editor, and it'll be compiled in real-time. All changes are saved to browser local storage."
         },
         {
           element: "#emulator",
@@ -719,8 +716,19 @@ function showWelcomeMessage() {
           element: "#dropdownMenuButton",
           title: "Main Menu",
           content: "Click the menu to switch between platforms, create new files, or share your work with others."
-        },
-    ]});
+        }];
+    if (!is_vcs) {
+      steps.push({
+        element: "#windowMenuButton",
+        title: "Window List",
+        content: "Switch between editor windows, assembly listings, and other tools like disassembler and memory dump."
+      });
+    }
+    var tour = new Tour({
+      autoscroll:false,
+      //storage:false,
+      steps:steps
+    });
     tour.init();
     setTimeout(function() { tour.start(); }, 2000);
   }
diff --git a/src/views.ts b/src/views.ts
index 6accb46d..fa665c11 100644
--- a/src/views.ts
+++ b/src/views.ts
@@ -9,7 +9,6 @@ var addr2symbol : {[addr:number]:string};
 var current_project;
 var VirtualList;
 var lastDebugState;
-var pixeditframe;
 
 // TODO: functions
 var inspectVariable;
@@ -238,7 +237,7 @@ function SourceEditor(path, mode) {
   function openBitmapEditorWithParams(fmt, bytestr, palfmt, palstr) {
     $("#pixeditback").show();
     window.addEventListener("message", handleWindowMessage, false); // TODO: remove listener
-    pixeditframe.contentWindow.postMessage({fmt:fmt, bytestr:bytestr, palfmt:palfmt, palstr:palstr}, '*');
+    window['pixeditframe'].contentWindow.postMessage({fmt:fmt, bytestr:bytestr, palfmt:palfmt, palstr:palstr}, '*');
   }
 
   function lookBackwardsForJSONComment(line, req) {