PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

PR feedback

Browse source
This commit is contained in:
David Baker 2017-11-06 17:15:09 +00:00
parent 41e7496ff1
commit 08d006d112
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/rooms/MessageComposerInput.js
View file

@ -59,7 +59,9 @@ const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
const ZWS_CODE = 8203; const ZWS_CODE = 8203;
const ZWS = String.fromCharCode(ZWS_CODE); // zero width space const ZWS = String.fromCharCode(ZWS_CODE); // zero width space
const ATROOMPILL_ENTITY_TYPE = 'ATROOMPILL'; const ENTITY_TYPES = {
AT_ROOM_PILL = 'ATROOMPILL',
};
function stateToMarkdown(state) { function stateToMarkdown(state) {
return __stateToMarkdown(state) return __stateToMarkdown(state)
@ -199,7 +201,7 @@ export default class MessageComposerInput extends React.Component {
entityKey !== null && entityKey !== null &&
( (
contentState.getEntity(entityKey).getType() === 'LINK' || contentState.getEntity(entityKey).getType() === 'LINK' ||
contentState.getEntity(entityKey).getType() === ATROOMPILL_ENTITY_TYPE contentState.getEntity(entityKey).getType() === ENTITY_TYPES.AT_ROOM_PILL
) )
); );
}, callback, }, callback,
@ -221,7 +223,7 @@ export default class MessageComposerInput extends React.Component {
const Pill = sdk.getComponent('elements.Pill'); const Pill = sdk.getComponent('elements.Pill');
const type = entityProps.contentState.getEntity(entityProps.entityKey).getType(); const type = entityProps.contentState.getEntity(entityProps.entityKey).getType();
const {url} = entityProps.contentState.getEntity(entityProps.entityKey).getData(); const {url} = entityProps.contentState.getEntity(entityProps.entityKey).getData();
if (type === ATROOMPILL_ENTITY_TYPE) { if (type === ENTITY_TYPES.AT_ROOM_PILL) {
return <Pill return <Pill
type={Pill.TYPE_AT_ROOM_MENTION} type={Pill.TYPE_AT_ROOM_MENTION}
room={this.props.room} room={this.props.room}
@ -1004,7 +1006,7 @@ export default class MessageComposerInput extends React.Component {
}); });
entityKey = contentState.getLastCreatedEntityKey(); entityKey = contentState.getLastCreatedEntityKey();
} else if (completion === '@room') { } else if (completion === '@room') {
contentState = contentState.createEntity(ATROOMPILL_ENTITY_TYPE, 'IMMUTABLE', { contentState = contentState.createEntity(ENTITY_TYPES.AT_ROOM_PILL, 'IMMUTABLE', {
isCompletion: true, isCompletion: true,
}); });
entityKey = contentState.getLastCreatedEntityKey(); entityKey = contentState.getLastCreatedEntityKey();