From 5766bbfc65e3f6663737da5d15359d68e3f991ff Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 24 Aug 2015 20:47:27 -0700
Subject: Prevents users from typing more than 4000 characters into any
 'textbox' (posts, comments, and post/comment edits).  Also adds new error
 message for when users hit exactly 4000 characters so they know the limit.

---
 web/react/components/create_comment.jsx  | 10 +++++++++-
 web/react/components/create_post.jsx     | 10 +++++++++-
 web/react/components/edit_post_modal.jsx | 15 ++++++++++++---
 web/react/components/textbox.jsx         |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 1de768872..59b0a5c2b 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -106,13 +106,21 @@ 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) {
+            newPostError = '';
+        }
+
         var draft = PostStore.getCommentDraft(this.props.rootId);
         draft.message = messageText;
         PostStore.storeCommentDraft(this.props.rootId, draft);
 
         $('.post-right__scroll').scrollTop($('.post-right__scroll')[0].scrollHeight);
         $('.post-right__scroll').perfectScrollbar('update');
-        this.setState({messageText: messageText});
+        this.setState({messageText: messageText, postError: newPostError});
     },
     handleUploadStart: function(clientIds, channelId) {
         var draft = PostStore.getCommentDraft(this.props.rootId);
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index efaa40577..242513d07 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -132,8 +132,16 @@ 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) {
+            newPostError = '';
+        }
+
         this.resizePostHolder();
-        this.setState({messageText: messageText});
+        this.setState({messageText: messageText, postError: newPostError});
 
         var draft = PostStore.getCurrentDraft();
         draft['message'] = messageText;
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index 2d865a45d..2dce889f8 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -3,6 +3,7 @@
 
 var Client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
+var Constants = require('../utils/constants.jsx');
 var Textbox = require('./textbox.jsx');
 var BrowserStore = require('../stores/browser_store.jsx');
 
@@ -37,7 +38,15 @@ module.exports = React.createClass({
         $(this.state.refocusId).focus();
     },
     handleEditInput: function(editText) {
-        this.setState({ editText: 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) {
+            newError = '';
+        }
+
+        this.setState({editText: editText, error: newError});
     },
     handleEditKeyPress: function(e) {
         if (e.which == 13 && !e.shiftKey && !e.altKey) {
@@ -53,7 +62,7 @@ module.exports = React.createClass({
         var self = this;
 
         $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
-            self.setState({ editText: "", title: "", channel_id: "", post_id: "", comments: 0, refocusId: "" });
+            self.setState({editText: "", title: "", channel_id: "", post_id: "", comments: 0, refocusId: "", error: ''});
         });
 
         $(this.refs.modal.getDOMNode()).on('show.bs.modal', function(e) {
@@ -69,7 +78,7 @@ module.exports = React.createClass({
         return { editText: "", title: "", post_id: "", channel_id: "", comments: 0, refocusId: "" };
     },
     render: function() {
-        var error = this.state.error ? <div className='form-group has-error'><label className='control-label'>{ this.state.error }</label></div> : null;
+        var error = this.state.error ? <div className='form-group has-error'><br /><label className='control-label'>{ this.state.error }</label></div> : <div className='form-group'><br /></div>;
 
         return (
             <div className="modal fade edit-modal" ref="modal" id="edit_post" role="dialog" tabIndex="-1" aria-hidden="true">
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index b5c5cc564..efd2dd810 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -257,7 +257,7 @@ module.exports = React.createClass({
         return (
             <div ref='wrapper' className='textarea-wrapper'>
                 <CommandList ref='commands' addCommand={this.addCommand} channelId={this.props.channelId} />
-                <textarea id={this.props.id} ref='message' className={'form-control custom-textarea ' + this.state.connection} spellCheck='true' autoComplete='off' autoCorrect='off' rows='1' placeholder={this.props.createMessage} value={this.props.messageText} onInput={this.handleChange} onChange={this.handleChange} onKeyPress={this.handleKeyPress} onKeyDown={this.handleKeyDown} onFocus={this.handleFocus} onBlur={this.handleBlur} onPaste={this.handlePaste} />
+                <textarea id={this.props.id} ref='message' className={'form-control custom-textarea ' + this.state.connection} spellCheck='true' autoComplete='off' autoCorrect='off' rows='1' maxLength={Constants.MAX_POST_LEN} placeholder={this.props.createMessage} value={this.props.messageText} onInput={this.handleChange} onChange={this.handleChange} onKeyPress={this.handleKeyPress} onKeyDown={this.handleKeyDown} onFocus={this.handleFocus} onBlur={this.handleBlur} onPaste={this.handlePaste} />
             </div>
         );
     }
-- 
cgit v1.2.3-1-g7c22


From 656a88efdd2606ce8449097e740535f41aee9d64 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 25 Aug 2015 12:47:18 -0700
Subject: 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)

---
 web/react/components/create_comment.jsx  | 8 +++++---
 web/react/components/create_post.jsx     | 6 ++++--
 web/react/components/edit_post_modal.jsx | 9 ++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'web/react/components')

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 = '';
         }
 
-- 
cgit v1.2.3-1-g7c22


From a56603d666a4f3e22a92a0271eef56ab613ce848 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 26 Aug 2015 09:38:06 -0700
Subject: Moved duplicate code into functions and added better handling of
 large paste text dumps

---
 web/react/components/create_comment.jsx  | 13 +++----------
 web/react/components/create_post.jsx     | 14 ++++----------
 web/react/components/edit_post_modal.jsx | 14 +++-----------
 3 files changed, 10 insertions(+), 31 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 68bee800a..94b6e1b7f 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -105,16 +105,9 @@ module.exports = React.createClass({
             this.lastTime = t;
         }
     },
-    handleUserInput: function(messageText) {
-        var newPostError = this.state.postError;
-
-        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 = '';
-        }
+    handleUserInput: function(message) {
+        var messageText = utils.truncateText(message);
+        var newPostError = utils.checkMessageLengthError(messageText, this.state.postError, 'Comment length cannot exceed ' + Constants.MAX_POST_LEN + ' characters');
 
         var draft = PostStore.getCommentDraft(this.props.rootId);
         draft.message = messageText;
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 387149b14..19270197e 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -18,6 +18,7 @@ var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 module.exports = React.createClass({
+    displayName: 'CreatePost',
     lastTime: 0,
     handleSubmit: function(e) {
         e.preventDefault();
@@ -131,16 +132,9 @@ module.exports = React.createClass({
             this.lastTime = t;
         }
     },
-    handleUserInput: function(messageText) {
-        var newPostError = this.state.postError;
-
-        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' && len < Constants.MAX_POST_LEN) {
-            newPostError = '';
-        }
+    handleUserInput: function(message) {
+        var messageText = utils.truncateText(message);
+        var newPostError = utils.checkMessageLengthError(messageText, this.state.postError, 'Message length cannot exceed ' + Constants.MAX_POST_LEN + ' characters');
 
         this.resizePostHolder();
         this.setState({messageText: messageText, postError: newPostError});
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index 39d058f30..8ffd5013a 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -39,17 +39,9 @@ module.exports = React.createClass({
         $(this.state.refocusId).focus();
     },
     handleEditInput: function(editText) {
-        var newError = this.state.error;
-
-        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 = '';
-        }
-
-        this.setState({editText: editText, error: newError});
+        var editMessage = utils.truncateText(editText);
+        var newError = utils.checkMessageLengthError(editMessage, this.state.error, 'New message length cannot exceed ' + Constants.MAX_POST_LEN + ' characters');
+        this.setState({editText: editMessage, error: newError});
     },
     handleEditKeyPress: function(e) {
         if (e.which == 13 && !e.shiftKey && !e.altKey) {
-- 
cgit v1.2.3-1-g7c22