@naanlang/naan 1.0.3 → 1.0.6

package/lib/browser/env_web.js

@@ -74,14 +74,17 @@ exports.NaanControllerWeb = function() {
     //
  
     var naanlib = new exports.Naanlib();
+    var dontSaveUntilWorking;                                               // true when state loaded, must be reset to save state again
     var contSelf = this;                                                    // this is us, for access within nested functions
     exports.naancon = this;                                                 // access to this instance
     contSelf.anaan = naanlib.js.n;
     naanlib.js.t = contSelf;
+    naanlib.js.q = querystrings;
     var replstate;                                                          // latest known state of the REPL
     var naanstate;                                                          // desired state for the interpreter
     var replqueue;                                                          // text destined for terminal when opened
     var termlist = [];                                                      // list of terminals currently attached
+    contSelf.termlist = termlist;
     var prefs = { };
     var vsiteName;
 
@@ -306,8 +309,11 @@ exports.NaanControllerWeb = function() {
     //
     
     this.VsiteRefresh = function VsiteRefresh(url_origin) {
-        if (window.location.href.startsWith(url_origin))
+        if (window.location.href.startsWith(url_origin)) {
             window.location.reload();                                       // we have changed underneath
+            return (true);
+        }
+        return (false);
     };
 
 
@@ -411,6 +417,16 @@ exports.NaanControllerWeb = function() {
     this.LoadPref = function LoadPref(key) {
         return (prefs[key]);
     };
+    
+    //
+    // Working
+    //
+    // The application is working, so it is safe to save state.
+    //
+    
+    this.Working = function Working() {
+        dontSaveUntilWorking = false;
+    };
  
     var saveEvent = new Event("NaanSave");
  
@@ -442,7 +458,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.3-1";
+        statedoc.verstring = "1.0.6-1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -460,7 +476,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.3-1")
+            || statedoc.verstring != "1.0.6-1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -474,6 +490,10 @@ exports.NaanControllerWeb = function() {
  
     function saveLocal() {
         /*jshint sub:true */
+        if (dontSaveUntilWorking) {                                         // saved state is problematic
+            localStorage.removeItem("NaanState_Hosted");
+            return (false);
+        }
         if (querystrings["nosave"])
             return (false);
         var statedoc = makeState();
@@ -497,6 +517,7 @@ exports.NaanControllerWeb = function() {
             if ("localStorage" in window && window["localStorage"] !== null)
             {
                 var statestr = localStorage.getItem("NaanState_Hosted");
+                dontSaveUntilWorking = true;
                 if (statestr)
                     return (loadState(JSON.parse(statestr)));
             }
@@ -512,7 +533,8 @@ exports.NaanControllerWeb = function() {
             window.opener.Naanlang.naancon.DispatchMessage({
                 op: "VsiteOpen",
                 name: vsiteName,
-                naancont: contSelf
+                naancont: contSelf,
+                title: vsiteName + " 1.0.6-1"
             });
     }
     
@@ -521,7 +543,8 @@ exports.NaanControllerWeb = function() {
             window.opener.Naanlang.naancon.DispatchMessage({
                 op: "VsiteClose",
                 name: vsiteName,
-                naancont: contSelf
+                naancont: contSelf,
+                title: vsiteName + " 1.0.6-1"
             });
             termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
         }
@@ -540,9 +563,10 @@ exports.NaanControllerWeb = function() {
             naanlib.banner();
             naanlib.textLine("print();;\n");
         }
-        naanlib.start({
-            state: naanstate
-        });
+        if (!naanlib.start({ state: naanstate })) {                         // state loading failed
+            localStorage.removeItem("NaanState_Hosted");
+            window.location.reload();
+        }
     }
 
     if (window.opener) {