Merge pull request #493 from anx-ckreuzberger/master

Fixing issue #492 (reset undoStack to improve memory usage), improving core demo

Author: irskep

CHANGES.txt

@@ -1,3 +1,7 @@
+v0.*.* (Upcoming release)
+ * Reset undostack when loadSnapshot is called
+ * Store moving a shape with the SelectTool in undoStack
+
 v0.5.0:
  * Support for React 15 & 16
  * Fix XSS vulnerabilities in text tool (interactive & SVG output)

demo/core_demo.html

@@ -86,6 +86,8 @@
         <a href="javascript:void(0);" class='tool' id="hide-lc">Teardown</a>
         <a href="javascript:void(0);" class='tool' id="show-lc">Setup</a>
         <a href="javascript:void(0);" class='tool' id="clear-lc">Clear</a>
+        <a href="javascript:void(0);" class='tool' id="undo-lc">Undo</a>
+        <a href="javascript:void(0);" class='tool' id="redo-lc">Redo</a>
       </div>
 
       <div class="toolset">
@@ -204,6 +206,14 @@
           lc.clear();
         });
 
+        $("#undo-lc").click(function() {
+          lc.undo();
+        });
+
+        $("#redo-lc").click(function() {
+          lc.redo();
+        });
+
         // Set up our own tools...
         tools = [
           {

src/core/LiterallyCanvas.coffee

@@ -486,7 +486,11 @@ module.exports = class LiterallyCanvas
         @setColor(k, snapshot.colors[k])
 
     if snapshot.shapes
+      # reset shapes
       @shapes = []
+      # reset undostack aswell when loading a snapshot
+      @undostack = []
+
       for shapeRepr in snapshot.shapes
         shape = JSONToShape(shapeRepr)
         @execute(new actions.AddShapeAction(this, shape)) if shape