Merge pull request #1095 from vorth/online-redos

Legacy history now synced with target editNumber for online

Author: vorth

online/src/worker/legacy/controllers/index.js

@@ -75,14 +75,15 @@ const initializeDesign = ( loading, polygons, legacyDesign, core, clientEvents )
   // polygons is a configuration from the client, to distinguish between a modern client
   //   and the legacy React-based interpreter/debugger UI.  They require different shape encodings.
 
-  const { lighting, camera, scenes, snapshotNodes } = legacyDesign;
+  const { lighting, camera, scenes, snapshotNodes, history, targetEdit } = legacyDesign;
   const renderHistory = new RenderHistory( legacyDesign, polygons );                          // used for all normal rendering
   const interpreter = new Interpreter( legacyDesign, renderHistory );
   const renderingChanges = renderedModelTransducer( renderHistory.getShapes(), clientEvents ); // used only for preview struts
 
   if ( loading ) {
     // interpretation may take several seconds, which is why we already reported PARSE_COMPLETED
     interpreter .interpret( Step.DONE );
+    history .goToEdit( targetEdit )
   } // else in debug mode, we'll interpret incrementally
 
   // TODO: define a better contract for before/after.

online/src/worker/legacy/parser.js

@@ -131,11 +131,12 @@ export const createParser = ( documentFactory ) => ( xmlText ) =>
   const historyElement = vZomeRoot.getChildElement( "EditHistory" ) || vZomeRoot.getChildElement( "editHistory" ) || vZomeRoot.getChildElement( "EditHistoryDetails" );
   const xmlTree = assignIds( historyElement.nativeElement );
   const edits = new ParsedEdit( xmlTree, null, legacyDesign.interpretEdit );
-  const targetEditId = `:${edits.getAttribute( "editNumber" )}:`
+  const targetEdit = Number( edits.getAttribute( "editNumber" ) );
+  const targetEditId = `:${targetEdit}:`
   const firstEdit = edits.firstChild()
 
   const snapshotNodes = [ ...findSnapshotNodes( xmlTree ), targetEditId ]; // The extra snapshot is discarded later
   const scenes = parseArticle( vZomeRoot.getChildElement( "notes" ) );
 
-  return { ...legacyDesign, firstEdit, camera, lighting, xmlTree, scenes, snapshotNodes }
+  return { ...legacyDesign, firstEdit, camera, lighting, xmlTree, scenes, snapshotNodes, targetEdit }
 }