Merge pull request #396 from matrix-org/rav/fix_react_warning
Hack around a react warningpull/21833/head
						commit
						13a4bfa8fe
					
				|  | @ -1100,7 +1100,7 @@ module.exports = React.createClass({ | |||
|                 <div className="mx_MatrixChat_wrapper"> | ||||
|                     {topBar} | ||||
|                     <div className={bodyClasses}> | ||||
|                         <LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs} opacity={this.state.sideOpacity}/> | ||||
|                         <LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs || false} opacity={this.state.sideOpacity}/> | ||||
|                         <main className="mx_MatrixChat_middlePanel"> | ||||
|                             {page_element} | ||||
|                         </main> | ||||
|  |  | |||
|  | @ -33,7 +33,7 @@ module.exports = React.createClass({ | |||
| 
 | ||||
|     propTypes: { | ||||
|         ConferenceHandler: React.PropTypes.any, | ||||
|         collapsed: React.PropTypes.bool, | ||||
|         collapsed: React.PropTypes.bool.isRequired, | ||||
|         currentRoom: React.PropTypes.string, | ||||
|         searchFilter: React.PropTypes.string, | ||||
|     }, | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker