3 files changed, 32 insertions, 6 deletions

diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
index 6f3826f75..5b3c74e82 100644
--- a/web/react/components/edit_channel_modal.jsx
+++ b/web/react/components/edit_channel_modal.jsx
@@ -73,7 +73,7 @@ export default class EditChannelModal extends React.Component {
                 className='modal-title'
                 ref='title'
             >
-                Edit Header
+            {'Edit Header'}
             </h4>
         );
         if (this.state.title) {
@@ -82,7 +82,7 @@ export default class EditChannelModal extends React.Component {
                     className='modal-title'
                     ref='title'
                 >
-                    Edit Header for <span className='name'>{this.state.title}</span>
+                    {'Edit Header for '}<span className='name'>{this.state.title}</span>
                 </h4>
             );
         }
@@ -105,11 +105,12 @@ export default class EditChannelModal extends React.Component {
                                 data-dismiss='modal'
                                 aria-label='Close'
                             >
-                                <span aria-hidden='true'>&times;</span>
+                                <span aria-hidden='true'>{'×'}</span>
                             </button>
                             {editTitle}
                         </div>
                         <div className='modal-body'>
+                            <p>{'Edit the text appearing next to the channel name in the channel header.'}</p>
                             <textarea
                                 className='form-control no-resize'
                                 rows='6'
@@ -125,14 +126,14 @@ export default class EditChannelModal extends React.Component {
                                 className='btn btn-default'
                                 data-dismiss='modal'
                             >
-                                Cancel
+                                {'Cancel'}
                             </button>
                             <button
                                 type='button'
                                 className='btn btn-primary'
                                 onClick={this.handleEdit}
                             >
-                                Save
+                                {'Save'}
                             </button>
                         </div>
                     </div>
diff --git a/web/react/components/edit_channel_purpose_modal.jsx b/web/react/components/edit_channel_purpose_modal.jsx
index d8102642e..4d162cfe7 100644
--- a/web/react/components/edit_channel_purpose_modal.jsx
+++ b/web/react/components/edit_channel_purpose_modal.jsx
@@ -69,6 +69,11 @@ export default class EditChannelPurposeModal extends React.Component {
             title = <span>{'Edit Purpose for '}<span className='name'>{this.props.channel.display_name}</span></span>;
         }
 
+        let channelTerm = 'Channel';
+        if (this.props.channel.channelType === 'P') {
+            channelTerm = 'Group';
+        }
+
         return (
             <Modal
                 className='modal-edit-channel-purpose'
@@ -81,6 +86,7 @@ export default class EditChannelPurposeModal extends React.Component {
                     </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
+                    <p>{`Describe how this ${channelTerm} should be used.`}</p>
                     <textarea
                         ref='purpose'
                         className='form-control no-resize'
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index e5bede026..2abb3f151 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -6,6 +6,10 @@ var AsyncClient = require('../utils/async_client.jsx');
 var Textbox = require('./textbox.jsx');
 var BrowserStore = require('../stores/browser_store.jsx');
 var PostStore = require('../stores/post_store.jsx');
+var PreferenceStore = require('../stores/preference_store.jsx');
+
+var Constants = require('../utils/constants.jsx');
+var KeyCodes = Constants.KeyCodes;
 
 export default class EditPostModal extends React.Component {
     constructor() {
@@ -16,6 +20,8 @@ export default class EditPostModal extends React.Component {
         this.handleEditKeyPress = this.handleEditKeyPress.bind(this);
         this.handleUserInput = this.handleUserInput.bind(this);
         this.handleEditPostEvent = this.handleEditPostEvent.bind(this);
+        this.handleKeyDown = this.handleKeyDown.bind(this);
+        this.onPreferenceChange = this.onPreferenceChange.bind(this);
 
         this.state = {editText: '', title: '', post_id: '', channel_id: '', comments: 0, refocusId: ''};
     }
@@ -51,7 +57,7 @@ export default class EditPostModal extends React.Component {
         this.setState({editText: editMessage});
     }
     handleEditKeyPress(e) {
-        if (e.which === 13 && !e.shiftKey && !e.altKey) {
+        if (this.state.ctrlSend === 'false' && e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
             e.preventDefault();
             ReactDOM.findDOMNode(this.refs.editbox).blur();
             this.handleEdit(e);
@@ -72,6 +78,16 @@ export default class EditPostModal extends React.Component {
 
         $(ReactDOM.findDOMNode(this.refs.modal)).modal('show');
     }
+    handleKeyDown(e) {
+        if (this.state.ctrlSend === 'true' && e.keyCode === KeyCodes.ENTER && e.ctrlKey === true) {
+            this.handleEdit(e);
+        }
+    }
+    onPreferenceChange() {
+        this.setState({
+            ctrlSend: PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter', {value: 'false'}).value
+        });
+    }
     componentDidMount() {
         var self = this;
 
@@ -101,9 +117,11 @@ export default class EditPostModal extends React.Component {
         });
 
         PostStore.addEditPostListener(this.handleEditPostEvent);
+        PreferenceStore.addChangeListener(this.onPreferenceChange);
     }
     componentWillUnmount() {
         PostStore.removeEditPostListener(this.handleEditPostEvent);
+        PreferenceStore.removeChangeListener(this.onPreferenceChange);
     }
     render() {
         var error = (<div className='form-group'><br /></div>);
@@ -138,6 +156,7 @@ export default class EditPostModal extends React.Component {
                             <Textbox
                                 onUserInput={this.handleEditInput}
                                 onKeyPress={this.handleEditKeyPress}
+                                onKeyDown={this.handleKeyDown}
                                 messageText={this.state.editText}
                                 createMessage='Edit the post...'
                                 id='edit_textbox'