summaryrefslogtreecommitdiffstats
path: root/web/react/components/edit_post_modal.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-12-16 09:10:24 -0500
committerChristopher Speller <crspeller@gmail.com>2015-12-16 09:10:24 -0500
commit34e0ac00e81f5e8912e341e4fece3b38dbb6cf76 (patch)
tree1e67c2ce24f447e26d4abc63df28a3828c919e60 /web/react/components/edit_post_modal.jsx
parent3e418a100a3a491ebff7ba72ac003dd06752a30a (diff)
parent23af326af20cffef59ac8859e7def38f744a452b (diff)
downloadchat-34e0ac00e81f5e8912e341e4fece3b38dbb6cf76.tar.gz
chat-34e0ac00e81f5e8912e341e4fece3b38dbb6cf76.tar.bz2
chat-34e0ac00e81f5e8912e341e4fece3b38dbb6cf76.zip
Merge pull request #1733 from hmhealey/plt1437
PLT-1437 PreferenceStore api changes and fixing CreatePost warning
Diffstat (limited to 'web/react/components/edit_post_modal.jsx')
-rw-r--r--web/react/components/edit_post_modal.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index be57fe7c3..e4e77a943 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -58,7 +58,7 @@ export default class EditPostModal extends React.Component {
this.setState({editText: editMessage});
}
handleEditKeyPress(e) {
- if (this.state.ctrlSend === 'false' && e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
+ if (!this.state.ctrlSend && e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
e.preventDefault();
ReactDOM.findDOMNode(this.refs.editbox).blur();
this.handleEdit(e);
@@ -80,13 +80,13 @@ 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) {
+ if (this.state.ctrlSend && 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
+ ctrlSend: PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter')
});
}
componentDidMount() {