merge

1 files changed, 8 insertions, 8 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index c5c996c..9a557b9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -58,8 +58,8 @@ Map.UI.Editor = function(map){
 
       UndoStack.push({
         type: "destroy-room",
-        prev: room.copy(),
-        next: { id: room.id },
+        undo: room.copy(),
+        redo: { id: room.id },
       })
 
 			Rooms.remove(room)
@@ -164,8 +164,8 @@ Map.UI.Editor = function(map){
 
         UndoStack.push({
           type: "create-room",
-          prev: { id: room.id },
-          next: room.copy()
+          undo: { id: room.id },
+          redo: room.copy()
         })
         
 				app.tube("builder-pick-room", room)
@@ -185,8 +185,8 @@ Map.UI.Editor = function(map){
       
       UndoStack.push({
         type: "update-room",
-        prev: oldState,
-        next: base.dragging.copy()
+        undo: oldState,
+        redo: base.dragging.copy()
       })
     }
     
@@ -211,8 +211,8 @@ Map.UI.Editor = function(map){
 			wheelTimeout = setTimeout(function(){
         UndoStack.push({
           type: "update-room",
-          prev: wheelState,
-          next: intersects[0].copy()
+          undo: wheelState,
+          redo: intersects[0].copy()
         })
         Rooms.clipper.update()
         wheelState = null