Merge pull request #4 from matrix-org/registration

Registration
2015-07-16 09:58:53 +01:00 · 2015-07-16 09:58:53 +01:00 · e2757b3587
commit e2757b3587
parent fe98d6ec69 931a4f29c8
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
        }
    },