merge

1 files changed, 20 insertions, 0 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 4bdb2c4..7798550 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -3,22 +3,42 @@
 		{
 			type: "create-scenery",
       undo: function(state){
+        Scenery.remove(state.id)
       },
       redo: function(state){
+        Scenery.deserialize([ state ])
       },
 		},
 		{
 			type: "update-scenery",
       undo: function(state){
+        var scenery = Scenery.find(state.id)
+        scenery.deserialize(state)
+        scenery.set_wall(Rooms.walls[ state.wall_id ])
+        
+        if (editor.permissions.resize) {
+          Scenery.resize.show(scenery)
+        }
       },
       redo: function(state){
+        var scenery = Scenery.find(state.id)
+        scenery.deserialize(state)
+        scenery.set_wall(Rooms.walls[ state.wall_id ])
+
+        if (editor.permissions.resize) {
+          Scenery.resize.show(scenery)
+          Scenery.resize.rotate_dots()
+          Scenery.resize.move_dots()
+        }
       },
 		},
 		{
 			type: "destroy-scenery",
       undo: function(state){
+        Scenery.deserialize([ state ])
       },
       redo: function(state){
+        Scenery.remove(state.id)
       },
 		},