Fixed issue with carriage returns being counted improperly in non-ie browsers and updated error messages to be appropriate to what is being typed (message vs. post vs. edit)

1 files changed, 5 insertions, 3 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 = '';
         }