mirror of https://github.com/vector-im/riot-web
				
				
				
			Merge pull request #621 from matrix-org/dbkr/add_searching_known_users
Add 'searching known users' to the user pickerpull/21833/head
						commit
						c47d3e04a5
					
				|  | @ -418,11 +418,16 @@ module.exports = React.createClass({ | |||
|         if (this.state.error) { | ||||
|             error = <div className="mx_ChatInviteDialog_error">You have entered an invalid contact. Try using their Matrix ID or email address.</div>; | ||||
|         } else { | ||||
|             const addressSelectorHeader = <div className="mx_ChatInviteDialog_addressSelectHeader"> | ||||
|                 Searching known users | ||||
|             </div>; | ||||
|             addressSelector = ( | ||||
|                 <AddressSelector ref={(ref) => {this.addressSelector = ref;}} | ||||
|                     addressList={ this.state.queryList } | ||||
|                     onSelected={ this.onSelected } | ||||
|                     truncateAt={ TRUNCATE_QUERY_LIST } /> | ||||
|                     truncateAt={ TRUNCATE_QUERY_LIST } | ||||
|                     header={ addressSelectorHeader } | ||||
|                 /> | ||||
|             ); | ||||
|         } | ||||
| 
 | ||||
|  |  | |||
|  | @ -28,6 +28,9 @@ module.exports = React.createClass({ | |||
|         addressList: React.PropTypes.array.isRequired, | ||||
|         truncateAt: React.PropTypes.number.isRequired, | ||||
|         selected: React.PropTypes.number, | ||||
| 
 | ||||
|         // Element to put as a header on top of the list
 | ||||
|         header: React.PropTypes.node, | ||||
|     }, | ||||
| 
 | ||||
|     getInitialState: function() { | ||||
|  | @ -141,6 +144,7 @@ module.exports = React.createClass({ | |||
| 
 | ||||
|         return ( | ||||
|             <div className={classes} ref={(ref) => {this.scrollElement = ref;}}> | ||||
|                 { this.props.header } | ||||
|                 { this.createAddressListTiles() } | ||||
|             </div> | ||||
|         ); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker