1 files changed, 2 insertions, 89 deletions

diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 327520210..76286eb88 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -31,11 +31,6 @@ module.exports = React.createClass({
 
         post.message = this.state.messageText;
 
-        // if this is a reply, trim off any carets from the beginning of a message
-        if (this.state.rootId && post.message[0] === "^") {
-            post.message = post.message.replace(/^\^+\s*/g, "");
-        }
-
         if (post.message.trim().length === 0 && this.state.previews.length === 0) {
             return;
         }
@@ -73,9 +68,6 @@ module.exports = React.createClass({
             post.channel_id = this.state.channel_id;
             post.filenames = this.state.previews;
 
-            post.root_id = this.state.rootId;
-            post.parent_id = this.state.parentId;
-
             client.createPost(post, ChannelStore.getCurrent(),
                 function(data) {
                     PostStore.storeDraft(data.channel_id, null);
@@ -92,12 +84,7 @@ module.exports = React.createClass({
                 }.bind(this),
                 function(err) {
                     var state = {}
-
-                    if (err.message === "Invalid RootId parameter") {
-                        if ($('#post_deleted').length > 0) $('#post_deleted').modal('show');
-                    } else {
-                        state.server_error = err.message;
-                    }
+                    state.server_error = err.message;
 
                     state.submitting = false;
                     this.setState(state);
@@ -106,17 +93,6 @@ module.exports = React.createClass({
         }
 
         $(".post-list-holder-by-time").perfectScrollbar('update');
-
-        if (this.state.rootId || this.state.parentId) {
-            this.setState({rootId: "", parentId: "", caretCount: 0});
-
-            // clear the active thread since we've now sent our message
-            AppDispatcher.handleViewAction({
-                type: ActionTypes.RECEIVED_ACTIVE_THREAD_CHANGED,
-                root_id: "",
-                parent_id: ""
-            });
-        }
     },
     componentDidUpdate: function() {
         this.resizePostHolder();
@@ -138,62 +114,6 @@ module.exports = React.createClass({
         this.resizePostHolder();
         this.setState({messageText: messageText});
 
-        // look to see if the message begins with any carets to indicate that it's a reply
-        var replyMatch = messageText.match(/^\^+/g);
-        if (replyMatch) {
-            // the number of carets indicates how many message threads back we're replying to
-            var caretCount = replyMatch[0].length;
-
-            // note that if someone else replies to this thread while a user is typing a reply, the message to which they're replying
-            // won't change unless they change the number of carets. this is probably the desired behaviour since we don't want the
-            // active message thread to change without the user noticing
-            if (caretCount != this.state.caretCount) {
-                this.setState({caretCount: caretCount});
-
-                var posts = PostStore.getCurrentPosts();
-
-                var rootId = "";
-
-                // find the nth most recent post that isn't a comment on another (ie it has no parent) where n is caretCount
-                for (var i = 0; i < posts.order.length; i++) {
-                    var postId = posts.order[i];
-
-                    if (posts.posts[postId].parent_id === "") {
-                        caretCount -= 1;
-
-                        if (caretCount < 1) {
-                            rootId = postId;
-                            break;
-                        }
-                    }
-                }
-
-                // only dispatch an event if something changed
-                if (rootId != this.state.rootId) {
-                    // set the parent id to match the root id so that we're replying to the first post in the thread
-                    var parentId = rootId;
-
-                    // alert the post list so that it can display the active thread
-                    AppDispatcher.handleViewAction({
-                        type: ActionTypes.RECEIVED_ACTIVE_THREAD_CHANGED,
-                        root_id: rootId,
-                        parent_id: parentId
-                    });
-                }
-            }
-        } else {
-            if (this.state.caretCount > 0) {
-                this.setState({caretCount: 0});
-
-                // clear the active thread since there no longer is one
-                AppDispatcher.handleViewAction({
-                    type: ActionTypes.RECEIVED_ACTIVE_THREAD_CHANGED,
-                    root_id: "",
-                    parent_id: ""
-                });
-            }
-        }
-
         var draft = PostStore.getCurrentDraft();
         if (!draft) {
             draft = {}
@@ -256,12 +176,10 @@ module.exports = React.createClass({
     },
     componentDidMount: function() {
         ChannelStore.addChangeListener(this._onChange);
-        PostStore.addActiveThreadChangedListener(this._onActiveThreadChanged);
         this.resizePostHolder();
     },
     componentWillUnmount: function() {
         ChannelStore.removeChangeListener(this._onChange);
-        PostStore.removeActiveThreadChangedListener(this._onActiveThreadChanged);
     },
     _onChange: function() {
         var channel_id = ChannelStore.getCurrentId();
@@ -278,11 +196,6 @@ module.exports = React.createClass({
             this.setState({ channel_id: channel_id, messageText: messageText, initialText: messageText, submitting: false, limit_error: null, server_error: null, post_error: null, previews: previews, uploadsInProgress: uploadsInProgress });
         }
     },
-    _onActiveThreadChanged: function(rootId, parentId) {
-        // note that we register for our own events and set the state from there so we don't need to manually set
-        // our state and dispatch an event each time the active thread changes
-        this.setState({"rootId": rootId, "parentId": parentId});
-    },
     getInitialState: function() {
         PostStore.clearDraftUploads();
 
@@ -293,7 +206,7 @@ module.exports = React.createClass({
             previews = draft['previews'];
             messageText = draft['message'];
         }
-        return { channel_id: ChannelStore.getCurrentId(), messageText: messageText, uploadsInProgress: 0, previews: previews, submitting: false, initialText: messageText, caretCount: 0 };
+        return { channel_id: ChannelStore.getCurrentId(), messageText: messageText, uploadsInProgress: 0, previews: previews, submitting: false, initialText: messageText };
     },
     setUploads: function(val) {
         var oldInProgress = this.state.uploadsInProgress