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/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@ -38,6 +38,12 @@ module.exports = React.createClass({
    mixins: [RoomViewController],

    render: function() {
+        if (!this.state.room) {
+            return (
+                <div />
+            );
+        }
+
        var myUserId = MatrixClientPeg.get().credentials.userId;
        if (this.state.room.currentState.members[myUserId].membership == 'invite') {
            if (this.state.joining) {