Merge pull request #1492 from matrix-org/luke/fix-room-address-tile-no-room-id
Don't show room IDs when picking rooms
This commit is contained in:
commit
c9576c9065
3 changed files with 20 additions and 3 deletions
|
@ -489,7 +489,12 @@ module.exports = React.createClass({
|
||||||
const AddressTile = sdk.getComponent("elements.AddressTile");
|
const AddressTile = sdk.getComponent("elements.AddressTile");
|
||||||
for (let i = 0; i < this.state.userList.length; i++) {
|
for (let i = 0; i < this.state.userList.length; i++) {
|
||||||
query.push(
|
query.push(
|
||||||
<AddressTile key={i} address={this.state.userList[i]} canDismiss={true} onDismissed={this.onDismissed(i)} />,
|
<AddressTile
|
||||||
|
key={i}
|
||||||
|
address={this.state.userList[i]}
|
||||||
|
canDismiss={true}
|
||||||
|
onDismissed={this.onDismissed(i)}
|
||||||
|
showAddress={this.props.pickerType === 'user'} />,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -539,6 +544,7 @@ module.exports = React.createClass({
|
||||||
addressSelector = (
|
addressSelector = (
|
||||||
<AddressSelector ref={(ref) => {this.addressSelector = ref;}}
|
<AddressSelector ref={(ref) => {this.addressSelector = ref;}}
|
||||||
addressList={this.state.queryList}
|
addressList={this.state.queryList}
|
||||||
|
showAddress={this.props.pickerType === 'user'}
|
||||||
onSelected={this.onSelected}
|
onSelected={this.onSelected}
|
||||||
truncateAt={TRUNCATE_QUERY_LIST}
|
truncateAt={TRUNCATE_QUERY_LIST}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -30,6 +30,8 @@ export default React.createClass({
|
||||||
|
|
||||||
// List of the addresses to display
|
// List of the addresses to display
|
||||||
addressList: React.PropTypes.arrayOf(UserAddressType).isRequired,
|
addressList: React.PropTypes.arrayOf(UserAddressType).isRequired,
|
||||||
|
// Whether to show the address on the address tiles
|
||||||
|
showAddress: React.PropTypes.bool,
|
||||||
truncateAt: React.PropTypes.number.isRequired,
|
truncateAt: React.PropTypes.number.isRequired,
|
||||||
selected: React.PropTypes.number,
|
selected: React.PropTypes.number,
|
||||||
|
|
||||||
|
@ -142,7 +144,13 @@ export default React.createClass({
|
||||||
key={this.props.addressList[i].addressType + "/" + this.props.addressList[i].address}
|
key={this.props.addressList[i].addressType + "/" + this.props.addressList[i].address}
|
||||||
ref={(ref) => { this.addressListElement = ref; }}
|
ref={(ref) => { this.addressListElement = ref; }}
|
||||||
>
|
>
|
||||||
<AddressTile address={this.props.addressList[i]} justified={true} networkName="vector" networkUrl="img/search-icon-vector.svg" />
|
<AddressTile
|
||||||
|
address={this.props.addressList[i]}
|
||||||
|
showAddress={this.props.showAddress}
|
||||||
|
justified={true}
|
||||||
|
networkName="vector"
|
||||||
|
networkUrl="img/search-icon-vector.svg"
|
||||||
|
/>
|
||||||
</div>,
|
</div>,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,7 +87,10 @@ export default React.createClass({
|
||||||
info = (
|
info = (
|
||||||
<div className="mx_AddressTile_mx">
|
<div className="mx_AddressTile_mx">
|
||||||
<div className={nameClasses}>{ name }</div>
|
<div className={nameClasses}>{ name }</div>
|
||||||
<div className={idClasses}>{ address.address }</div>
|
{ this.props.showAddress ?
|
||||||
|
<div className={idClasses}>{ address.address }</div> :
|
||||||
|
<div />
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
} else if (isMatrixAddress) {
|
} else if (isMatrixAddress) {
|
||||||
|
|
Loading…
Reference in a new issue