Merge branch 'master' into upgrade-dependencies

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

1 files changed, 8 insertions, 1 deletions

diff --git a/src/reducers/construction-mode.js b/src/reducers/construction-mode.js
index f58684e6..b5e6e781 100644
--- a/src/reducers/construction-mode.js
+++ b/src/reducers/construction-mode.js
@@ -4,9 +4,12 @@ import { GO_DOWN_ONE_INTERACTION_LEVEL } from "../actions/interaction-level";
 import {
   CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
   FINISH_NEW_ROOM_CONSTRUCTION,
-  START_NEW_ROOM_CONSTRUCTION_SUCCEEDED
+  FINISH_ROOM_EDIT,
+  START_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
+  START_ROOM_EDIT
 } from "../actions/topology/building";
 import {
+  DELETE_ROOM,
   START_RACK_CONSTRUCTION,
   STOP_RACK_CONSTRUCTION
 } from "../actions/topology/room";
@@ -15,9 +18,13 @@ export function currentRoomInConstruction(state = -1, action) {
   switch (action.type) {
     case START_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
       return action.roomId;
+    case START_ROOM_EDIT:
+      return action.roomId;
     case CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
     case FINISH_NEW_ROOM_CONSTRUCTION:
     case OPEN_EXPERIMENT_SUCCEEDED:
+    case FINISH_ROOM_EDIT:
+    case DELETE_ROOM:
       return -1;
     default:
       return state;