Merge pull request #21 from PatrickSachs/develop

1.0.1

Author: Patrick Sachs

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "slow-tree",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {

package.json

@@ -35,6 +35,14 @@ export default class CommandManager {
         }
     }
 
+    /**
+     * Clears the undo/redo stacks.
+     */
+    public clear() {
+        this._undo = [];
+        this._redo = [];
+    }
+
     /**
      * Redoes the last undone command and removes it from the redo stack. If no command has 
      * been undone before no action is performed.

src/commands/CommandManager.ts

@@ -40,7 +40,7 @@ export default class DestroyTreeElementCommand implements ICommand {
             if (!owner) {
                 throw new SlowTreeError("Could not un-delete tree element with owner " + this.owner);
             }
-            // A kinda hacky workaround leveraging the fact that the save data strcuture is the
+            // A kinda hacky workaround leveraging the fact that the save data structure is the
             // same as the one used in game.
             // For a larger project a better solution might be warraned, but in this case it does 
             // the job just fine.

src/commands/DestroyTreeElementCommand.ts

@@ -130,7 +130,7 @@
       </v-content>
       <v-footer app height="auto">
         <v-flex text-xs-center xs12>
-          slow-tree &copy;2019 —
+          slow-tree {{pkg.version}} &copy;2019 —
           <strong>sahnee.de</strong>
         </v-flex>
       </v-footer>
@@ -204,6 +204,7 @@ import TreeType from "@/TreeType";
 import uuid from "@/utils/uuid";
 import LeavesGameObject from "@/gameobjects/LeavesGameObject";
 import FileSaver from "file-saver";
+import pkg from "../../package.json";
 
 interface IMenuItem {
   id: string;
@@ -241,6 +242,7 @@ export default class STApp extends Vue {
   private angle: integer = 25;
   private oldSavegameVersion: boolean = false;
   private errorMessage: string = "";
+  private pkg = pkg;
 
   /**
    * Called when the component is ready to be used, but has no HTMl elements yet.
@@ -424,6 +426,7 @@ export default class STApp extends Vue {
         const json = JSON.parse(reader.result as string);
         console.log("Uploaded file ...", json);
         try {
+          this.game!.cmd.clear();
           scene.loadGame(json);
           this.cache();
         } catch (error) {
@@ -441,8 +444,9 @@ export default class STApp extends Vue {
    * Called when the user clicks on the delete button.
    */
   onClickDelete() {
-    if (this.scene) {
+    if (this.game && this.scene) {
       this.scene.clear();
+      this.game.cmd.clear();
       this.tree = this.scene.tree.treeType.id;
     }
     localStorage.removeItem("cache");

src/components/App.vue

@@ -0,0 +1,5 @@
+declare module '*.json' {
+    type JSON = { [key: string]: JSON | string | number | boolean | null | undefined };
+    const JSONObject: JSON;
+    export default JSONObject;
+}