OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

try for a simpler invite placeholder look & feel

pull/21833/head
Matthew Hodgson 2016-01-24 19:02:18 +00:00
parent 872b9be17a
commit 6eea1f7f83
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/views/rooms/MemberList.js
View File

@ -162,10 +162,10 @@ module.exports = React.createClass({
// sanity check the input for user IDs // sanity check the input for user IDs
if (!isEmailAddress && (inputText[0] !== '@' || inputText.indexOf(":") === -1)) { if (!isEmailAddress && (inputText[0] !== '@' || inputText.indexOf(":") === -1)) {
console.error("Bad user ID to invite: %s", inputText); console.error("Bad ID to invite: %s", inputText);
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Invite Error", title: "Invite Error",
description: "Malformed user ID. Should look like '@localpart:domain'" description: "Malformed ID. Should be an email address or a Matrix ID like '@localpart:domain'"
}); });
return; return;
} }
@ -273,7 +273,7 @@ module.exports = React.createClass({
_createOverflowTile: function(overflowCount, totalCount) { _createOverflowTile: function(overflowCount, totalCount) {
// For now we'll pretend this is any entity. It should probably be a separate tile. // For now we'll pretend this is any entity. It should probably be a separate tile.
var EntityTile = sdk.getComponent("rooms.EntityTile"); var EntityTile = sdk.getComponent("rooms.EntityTile");
var BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") + "..."; var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") + "...";
return ( return (
<EntityTile className="mx_EntityTile_ellipsis" avatarJsx={ <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
@ -314,17 +314,20 @@ module.exports = React.createClass({
onSearchQueryChanged: function(input) { onSearchQueryChanged: function(input) {
var EntityTile = sdk.getComponent("rooms.EntityTile"); var EntityTile = sdk.getComponent("rooms.EntityTile");
var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
var label; var label = input;
if (input[0] === "@") { // if (input[0] === "@") {
label = input; // label = input;
} // }
else { // else {
label = "Email: " + input; // label = "Email: " + input;
} // }
this._emailEntity = new Entities.newEntity( this._emailEntity = new Entities.newEntity(
<EntityTile key="dynamic_invite_tile" suppressOnHover={true} showInviteButton={true} <EntityTile key="dynamic_invite_tile" suppressOnHover={true} showInviteButton={true}
avatarJsx={ <BaseAvatar name="@" width={36} height={36} /> }
className="mx_EntityTile_invitePlaceholder"
presenceState="online" onClick={this.onInvite.bind(this, input)} name={label} />, presenceState="online" onClick={this.onInvite.bind(this, input)} name={label} />,
function(query) { function(query) {
return true; // always show this return true; // always show this