Merge pull request #320 from matrix-org/rav/fix_room_setting_warnings

Fix a pair of warnings from RoomSettings
matrix-org · Jun 23, 2016 · 38a1a0b · 38a1a0b
2 parents e741226 + 7a7d7c0
commit 38a1a0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
         };
     },