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

Merge branch 'develop' into wmwragg/direct-chat-sublist

pull/21833/head
wmwragg 2016-08-11 16:48:31 +01:00
parent a07833e7fc 109184aab7
commit cc1cec8431
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/rooms/MessageComposer.js
View File

@ -231,15 +231,20 @@ export default class MessageComposer extends React.Component {
); );
} }
return ( let autoComplete;
<div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}> if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) {
<div className="mx_MessageComposer_autocomplete_wrapper"> autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper">
<Autocomplete <Autocomplete
ref="autocomplete" ref="autocomplete"
onConfirm={this._onAutocompleteConfirm} onConfirm={this._onAutocompleteConfirm}
query={this.state.autocompleteQuery} query={this.state.autocompleteQuery}
selection={this.state.selection} /> selection={this.state.selection} />
</div> </div>;
}
return (
<div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}>
{autoComplete}
<div className="mx_MessageComposer_wrapper"> <div className="mx_MessageComposer_wrapper">
<div className="mx_MessageComposer_row"> <div className="mx_MessageComposer_row">
{controls} {controls}