Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 6 insertions, 3 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 998f7c6..6ad9e0d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -21,9 +21,10 @@
       type: "update-scenery",
       undo: function(state){
         var scenery = Scenery.find(state.id)
+        var wall = Walls.find( state.wall_id )
 
         scenery.deserialize(state)
-        scenery.set_wall(Walls.find( state.wall_id ))
+        scenery.set_wall({ wall: wall })
         
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
@@ -34,13 +35,15 @@
       },
       redo: function(state){
         var scenery = Scenery.find(state.id)
+        var wall = Walls.find( state.wall_id )
+
         scenery.deserialize(state)
-        scenery.set_wall(Walls.find( state.wall_id ))
+        scenery.set_wall({ wall: wall })
 
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
-          Scenery.resize.rotate_dots()
           Scenery.resize.move_dots()
+          Scenery.resize.rotate_dots()
         }
 
         // TODO: watch individual scenery object here