Removed command autocomplete from the comment textbox and edit post modal

3 files changed, 12 insertions, 2 deletions

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 8ceda1cf7..5c480eb2a 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -335,6 +335,7 @@ export default class CreateComment extends React.Component {
                                 messageText={this.state.messageText}
                                 createMessage='Add a comment...'
                                 initialText=''
+                                supportsCommands={false}
                                 id='reply_textbox'
                                 ref='textbox'
                             />
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index eb58fe721..be57fe7c3 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -160,6 +160,7 @@ export default class EditPostModal extends React.Component {
                                 onKeyDown={this.handleKeyDown}
                                 messageText={this.state.editText}
                                 createMessage='Edit the post...'
+                                supportsCommands={false}
                                 id='edit_textbox'
                                 ref='editbox'
                             />
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index bee5113c9..107e65f57 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -29,7 +29,10 @@ export default class Textbox extends React.Component {
             connection: ''
         };
 
-        this.suggestionProviders = [new AtMentionProvider(), new CommandProvider()];
+        this.suggestionProviders = [new AtMentionProvider()];
+        if (props.supportsCommands) {
+            this.suggestionProviders.push(new CommandProvider());
+        }
     }
 
     getStateFromStores() {
@@ -200,6 +203,10 @@ export default class Textbox extends React.Component {
     }
 }
 
+Textbox.defaultProps = {
+    supportsCommands: true
+};
+
 Textbox.propTypes = {
     id: React.PropTypes.string.isRequired,
     channelId: React.PropTypes.string,
@@ -208,5 +215,6 @@ Textbox.propTypes = {
     onKeyPress: React.PropTypes.func.isRequired,
     onHeightChange: React.PropTypes.func,
     createMessage: React.PropTypes.string.isRequired,
-    onKeyDown: React.PropTypes.func
+    onKeyDown: React.PropTypes.func,
+    supportsCommands: React.PropTypes.bool.isRequired
 };