Merge remote-tracking branch 'upstream/lcs2-dev-0918'

public/app.js

@@ -797,6 +797,10 @@ class App {
       saveObject: saveInfo,
       user: userAlias
     }
+
+    //dataJson.app = loadObj;
+    localStorage.setItem('lcs_app', JSON.stringify(loadObj));
+
     console.log(loadObj);
 
     //temporary solution for syncing DB replicas using Gun.load()

public/vwf.js

@@ -829,6 +829,24 @@
 
             try {
 
+                let objToRef = Object.assign({}, path);
+
+                if(path.saveObject){
+                    if ( path.saveObject[ "queue" ] ) {
+                        if ( path.saveObject[ "queue" ][ "time" ] ) {
+                            objToRef.saveObject = {
+                                "init": true,
+                                "queue":{
+                                    "time": path.saveObject[ "queue" ][ "time" ]
+                                }
+                            }
+                        }
+                    }
+                }
+
+            
+              
+
                 var options = {
 
                     // The socket is relative to the application path.
@@ -840,7 +858,7 @@
                         pathname: window.location.pathname.slice( 1,
                             window.location.pathname.lastIndexOf("/") ),
                         appRoot: "./public",
-                        path: JSON.stringify(path)
+                        path: JSON.stringify(objToRef)//JSON.stringify(path)
                       },
                     // query: 'pathname=' + window.location.pathname.slice( 1,
                     //     window.location.pathname.lastIndexOf("/") ),
@@ -854,6 +872,7 @@
 
                     //reconnect: false,
                     reconnection: false,
+                    upgrade: false,
                     transports: ['websocket']
 
                 };
@@ -1219,10 +1238,16 @@
             /// `setState` action, and if so, and if the application hasn't been created yet,
             /// returns the execution environment property.
 
-            function environment( actionName, parameters ) {
+            function environment( actionName, param ) {
 
                 if ( actionName === "setState" && ! vwf.application() ) {
 
+                    var parameters = param;
+
+                    if (parameters[0].init){
+                        parameters = [JSON.parse(localStorage.getItem('lcs_app')).saveObject]
+                    }
+
                     var applicationState = parameters && parameters[0];
 
                     if ( applicationState && Object.keys( applicationState ).length === 1 &&
@@ -1360,12 +1385,18 @@
         /// 
         /// @see {@link module:vwf/api/kernel.setState}
 
-        this.setState = function( applicationState, callback_async /* () */ ) {
+        this.setState = function( appState, callback_async /* () */ ) {
 
             this.logger.debuggx( "setState" );  // TODO: loggableState
 
             // Set the runtime configuration.
 
+            var applicationState = appState;
+
+            if (applicationState.init){
+                applicationState = JSON.parse(localStorage.getItem('lcs_app')).saveObject
+            }
+
             if ( applicationState.configuration ) {
                 require( "vwf/configuration" ).instance = applicationState.configuration;
             }