mirror of https://github.com/vector-im/riot-web
				
				
				
			Merge pull request #320 from matrix-org/rav/fix_room_setting_warnings
Fix a pair of warnings from RoomSettingspull/21833/head
						commit
						38a1a0b30f
					
				|  | @ -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, | ||||
|     }, | ||||
|  |  | |||
|  | @ -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
 | ||||
|         }; | ||||
|     }, | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker