Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style

Only show Autocomplete if autocomplete is enabled
matrix-org · Aug 11, 2016 · 109184a · 109184a
2 parents 3704e2c + 7cb663d
commit 109184a
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
@@ -231,15 +231,20 @@ export default class MessageComposer extends React.Component {
             );
         }
 
+        let autoComplete;
+        if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) {
+            autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper">
+                <Autocomplete
+                    ref="autocomplete"
+                    onConfirm={this._onAutocompleteConfirm}
+                    query={this.state.autocompleteQuery}
+                    selection={this.state.selection} />
+            </div>;
+        }
+
         return (
             <div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}>
-                <div className="mx_MessageComposer_autocomplete_wrapper">
-                    <Autocomplete
-                        ref="autocomplete"
-                        onConfirm={this._onAutocompleteConfirm}
-                        query={this.state.autocompleteQuery}
-                        selection={this.state.selection} />
-                </div>
+                {autoComplete}
                 <div className="mx_MessageComposer_wrapper">
                     <div className="mx_MessageComposer_row">
                         {controls}