Merge pull request #49 from setho246/41-Complete-the-nodeView

#41 complete the node view
YarnSpinnerTool · Aug 25, 2021 · 409675d · 409675d
2 parents 591a331 + d1d8bef
commit 409675d
Show file tree

Hide file tree

Showing 6 changed files with 9,505 additions and 314 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "yarnspinnereditor",
-    "version": "1.0.0",
+    "version": "0.1.0",
     "description": "A new editor for Yarn Spinner",
     "main": ".webpack/main",
     "scripts": {
@@ -86,4 +86,4 @@
         "konva": "^8.1.3",
         "monaco-editor": "^0.27.0"
     }
-}
+}
diff --git a/src/YarnSpinner/yarnSpinnerCompletions.js b/src/YarnSpinner/yarnSpinnerCompletions.js
@@ -81,7 +81,7 @@ export const completions = {
         }];
 
         //Get all of the text in the editor
-        var text = model.getValueInRange({startLineNumber: 1, startColumn: 1, endLineNumber: position.lineNumber, endColumn: position.column});
+        var text = model.getValue();
         //Regex for both titles and variables, global tag is used.
         var nodesRegex = /Title:\s?[A-Za-z0-9_]+[\.]*[A-Za-z0-9_]*/g;
         var variablesRegex = /\$[A-Za-z0-9_]+[\.]*[A-Za-z0-9_]*/g;

diff --git a/src/controllers/EditorController.ts b/src/controllers/EditorController.ts
@@ -179,25 +179,24 @@ export class EditorController
                     console.log("Delete node");
                     if (currentObject.returnNode) 
                     {
-                        nodeView.removeNode(currentObject.returnNode.getTitle());
+                        nodeView.removeNode(currentObject.returnNode);
                     }
                     break;
                 case ReturnCode.Update:
-                    // console.log("Updating node");
-                    // if(currentObject.returnTitles)
-                    // {
-                    //     nodeView.changeNodeName(currentObject.returnTitles[0], currentObject.returnTitles[1]);   
-                    // }
+                    console.log("Updating node");
+                    if(currentObject.returnNode)
+                    {
+                        nodeView.changeNodeName(currentObject.returnNode);   
+                    }
                     break;
                 case ReturnCode.Jumps:
-                    // console.log("Doing the jumps");
-                    // console.log(currentObject.returnJumps[0].getTarget());
+                    console.log("Doing the jumps");
+                    //if (currentObject.returnJumps.length !== 0)
+                    //{
+                    nodeView.receiveJumps(currentObject.returnJumps);
 
-                    // nodeView.receiveJumps(currentObject.returnJumps);
+                    //}
                     break;
-                    // case ReturnCode.None:
-                    //     //TODO something here, maybe a return from nodeView to get metadata info from nodes
-                    //     break;
                 }
             }
         }