From 7a7d7c0e023b62e9afd774232ea107cfeaa0d535 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 23 Jun 2016 11:15:55 +0100
Subject: [PATCH] Fix a pair of warnings from RoomSettings

- initialise the 'publish' checkbox correctly so react doesn't grumble about it
  turning from uncontrolled into controlled

- PowerSelector's 'controlled' property isn't really required, so mark it as
  such.
---
 src/components/views/elements/PowerSelector.js | 7 ++++++-
 src/components/views/rooms/RoomSettings.js     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index 3c65ca707c..993f2b965a 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -34,10 +34,15 @@ module.exports = React.createClass({
 
     propTypes: {
         value: React.PropTypes.number.isRequired,
+
         // if true, the <select/> should be a 'controlled' form element and updated by React
         // to reflect the current value, rather than left freeform.
         // MemberInfo uses controlled; RoomSettings uses non-controlled.
-        controlled: React.PropTypes.bool.isRequired,
+        //
+        // ignored if disabled is truthy. false by default.
+        controlled: React.PropTypes.bool,
+
+        // should the user be able to change the value? false by default.
         disabled: React.PropTypes.bool,
         onChange: React.PropTypes.func,
     },
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index d6b8b67f25..e6ec965422 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -64,7 +64,7 @@ module.exports = React.createClass({
             tags_changed: false,
             tags: tags,
             areNotifsMuted: areNotifsMuted,
-            isRoomPublished: this._originalIsRoomPublished, // loaded async in componentWillMount
+            isRoomPublished: false, // loaded async in componentWillMount
         };
     },