From ef027706b98d158a4ac5357fe19a3ef54e7adecc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 20 Aug 2015 16:47:25 +0100
Subject: [PATCH] Offer to join a room if you're not in it

---
 skins/base/views/organisms/RoomView.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
index b6bfedf190..7a22b0178c 100644
--- a/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@@ -83,9 +83,17 @@ module.exports = React.createClass({
 
     render: function() {
         if (!this.state.room) {
-            return (
-                <div />
-            );
+            if (this.props.roomId) {
+                return (
+                    <div>
+                    <button onClick={this.onJoinButtonClicked}>Join Room</button>
+                    </div>
+                );
+            } else {
+                return (
+                    <div />
+                );
+            }
         }
 
         var myUserId = MatrixClientPeg.get().credentials.userId;