Merge branch 'master' into vector

2015-07-16 10:33:53 +01:00 · 2015-07-16 10:33:53 +01:00 · 139b92fcd6
commit 139b92fcd6
parent 844a883ad8 e2757b3587
11 changed files with 553 additions and 12 deletions
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@ -36,7 +36,7 @@ var tileTypes = {
 module.exports = {
    getInitialState: function() {
        return {
-            room: MatrixClientPeg.get().getRoom(this.props.roomId),
+            room: this.props.roomId ? MatrixClientPeg.get().getRoom(this.props.roomId) : null,
            messageCap: INITIAL_SIZE
        }
    },