merge

1 files changed, 14 insertions, 0 deletions

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 3cfe969..4b14a21 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -35,6 +35,20 @@ environment.init = function(){
 			zoom: -4.8	
 		})
 	}
+
+  keys.on("z", function(e){
+    e.preventDefault()
+    if (e.ctrlKey || e.metaKey) {
+      if (e.shiftKey) {
+        var canRedo = UndoStack.redo()
+        console.log("can redo", canRedo)
+      }
+      else {
+        var canUndo = UndoStack.undo()
+        console.log("can undo", canUndo)
+      }
+    }
+  })
 }
 environment.update = function(t){
 	map.update()