diff options
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/create_comment.jsx | 8 | ||||
-rw-r--r-- | web/react/components/create_post.jsx | 6 | ||||
-rw-r--r-- | web/react/components/edit_post_modal.jsx | 9 |
3 files changed, 15 insertions, 8 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 59b0a5c2b..68bee800a 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -108,9 +108,11 @@ module.exports = React.createClass({ handleUserInput: function(messageText) { var newPostError = this.state.postError; - if (!this.state.postError && messageText.length >= Constants.MAX_POST_LEN) { - newPostError = 'Message length cannot exceed 4000 characters'; - } else if (this.state.postError === 'Message length cannot exceed 4000 characters' && messageText.length < Constants.MAX_POST_LEN) { + var len = utils.getLengthOfTextInTextarea(messageText); + + if (!this.state.postError && len >= Constants.MAX_POST_LEN) { + newPostError = 'Comment length cannot exceed 4000 characters'; + } else if (this.state.postError === 'Comment length cannot exceed 4000 characters' && len < Constants.MAX_POST_LEN) { newPostError = ''; } diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index 242513d07..387149b14 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -134,9 +134,11 @@ module.exports = React.createClass({ handleUserInput: function(messageText) { var newPostError = this.state.postError; - if (!this.state.postError && messageText.length >= Constants.MAX_POST_LEN) { + var len = utils.getLengthOfTextInTextarea(messageText); + + if (!this.state.postError && len >= Constants.MAX_POST_LEN) { newPostError = 'Message length cannot exceed 4000 characters'; - } else if (this.state.postError === 'Message length cannot exceed 4000 characters' && messageText.length < Constants.MAX_POST_LEN) { + } else if (this.state.postError === 'Message length cannot exceed 4000 characters' && len < Constants.MAX_POST_LEN) { newPostError = ''; } diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx index 2dce889f8..39d058f30 100644 --- a/web/react/components/edit_post_modal.jsx +++ b/web/react/components/edit_post_modal.jsx @@ -4,6 +4,7 @@ var Client = require('../utils/client.jsx'); var AsyncClient = require('../utils/async_client.jsx'); var Constants = require('../utils/constants.jsx'); +var utils = require('../utils/utils.jsx'); var Textbox = require('./textbox.jsx'); var BrowserStore = require('../stores/browser_store.jsx'); @@ -40,9 +41,11 @@ module.exports = React.createClass({ handleEditInput: function(editText) { var newError = this.state.error; - if (!this.state.error && editText.length >= Constants.MAX_POST_LEN) { - newError = 'Message length cannot exceed 4000 characters'; - } else if (this.state.error === 'Message length cannot exceed 4000 characters' && editText.length < Constants.MAX_POST_LEN) { + var len = utils.getLengthOfTextInTextarea(editText); + + if (!this.state.error && len >= Constants.MAX_POST_LEN) { + newError = 'New message length cannot exceed 4000 characters'; + } else if (this.state.error === 'New message length cannot exceed 4000 characters' && len < Constants.MAX_POST_LEN) { newError = ''; } |