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/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@ -37,6 +37,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) {