merge

1 files changed, 18 insertions, 0 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index cc5b014..fa247e1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -3,6 +3,7 @@ Scenery.move = function(base){
 
 	var x, y, z, bounds
 	var dragging = false
+	var oldState
 
 	this.bind = function(){
 		Scenery.mouse.bind_el(base.mx.el)
@@ -23,6 +24,12 @@ Scenery.move = function(base){
 	function down (e, cursor){
 		if (e.target != base.mx.el) return;
 		if (editor.permissions.destroy) {
+      UndoStack.push({
+        type: 'destroy-scenery',
+        undo: base.serialize(),
+        redo: { id: base.id },
+      })
+
 			Scenery.remove(base.id)
 			return
 		}
@@ -39,6 +46,7 @@ Scenery.move = function(base){
 		y = base.mx.y
 		z = base.mx.z
 		bounds = base.bounds
+		oldState = base.serialize()
 		document.body.classList.add("dragging")
 	}
 	
@@ -63,8 +71,18 @@ Scenery.move = function(base){
 	}
 
 	function up (e, cursor){
+    if (! dragging || ! oldState) return
+    
 		dragging = false
 		document.body.classList.remove("dragging")
+
+    UndoStack.push({
+      type: 'update-scenery',
+      undo: oldState,
+      redo: base.serialize(),
+    })
+    
+    oldState = null
 	}
 	
 	function switch_wall (e, new_wall, cursor){