Merge branch 'master' into upgrade-dependencies

# Conflicts:
#	src/reducers/construction-mode.js

1 files changed, 18 insertions, 0 deletions

diff --git a/src/actions/topology/building.js b/src/actions/topology/building.js
index 5aef2932..c6381a07 100644
--- a/src/actions/topology/building.js
+++ b/src/actions/topology/building.js
@@ -7,6 +7,8 @@ export const FINISH_NEW_ROOM_CONSTRUCTION = "FINISH_NEW_ROOM_CONSTRUCTION";
 export const CANCEL_NEW_ROOM_CONSTRUCTION = "CANCEL_NEW_ROOM_CONSTRUCTION";
 export const CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED =
   "CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED";
+export const START_ROOM_EDIT = "START_ROOM_EDIT";
+export const FINISH_ROOM_EDIT = "FINISH_ROOM_EDIT";
 export const ADD_TILE = "ADD_TILE";
 export const DELETE_TILE = "DELETE_TILE";
 
@@ -64,6 +66,22 @@ export function cancelNewRoomConstructionSucceeded() {
   };
 }
 
+export function startRoomEdit() {
+  return (dispatch, getState) => {
+    const { interactionLevel } = getState();
+    dispatch({
+      type: START_ROOM_EDIT,
+      roomId: interactionLevel.roomId
+    });
+  };
+}
+
+export function finishRoomEdit() {
+  return {
+    type: FINISH_ROOM_EDIT
+  };
+}
+
 export function toggleTileAtLocation(positionX, positionY) {
   return (dispatch, getState) => {
     const { objects, construction } = getState();