From 5f4daf6e20b0e6087ea9b0e985335d4602f52d45 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 15 Jun 2015 09:37:26 -0700
Subject: Invalid RootId parameter error message no longer displays on the
 client.  Changed acceptance of error from Agree to Okay.

---
 web/react/components/create_comment.jsx     | 3 ---
 web/react/components/post_deleted_modal.jsx | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'web/react')

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 3534c7573..0b8eb4a07 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -55,9 +55,6 @@ module.exports = React.createClass({
 
             }.bind(this),
             function(err) {
-                var state = {}
-                state.server_error = err.message;
-                this.setState(state);
                 if (err.message === "Invalid RootId parameter") {
                     if ($('#post_deleted').length > 0) $('#post_deleted').modal('show');
                 }
diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx
index 307120df3..83b007bad 100644
--- a/web/react/components/post_deleted_modal.jsx
+++ b/web/react/components/post_deleted_modal.jsx
@@ -23,7 +23,7 @@ module.exports = React.createClass({
                             <p>Someone deleted the message on which you tried to post a comment.</p>
                         </div>
                         <div className="modal-footer">
-                          <button type="button" className="btn btn-primary" data-dismiss="modal">Agree</button>
+                          <button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button>
                         </div>
                       </div>
                    </div>
-- 
cgit v1.2.3-1-g7c22


From 3895599c8f6ddc987a5c92ded800228547348dc6 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 15 Jun 2015 11:09:57 -0700
Subject: Error messages revolving around comment creation appear clientside
 unless we have a better solution in place

---
 web/react/components/create_comment.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'web/react')

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 0b8eb4a07..9bcbad079 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -55,9 +55,15 @@ module.exports = React.createClass({
 
             }.bind(this),
             function(err) {
+                var state = {};
+                state.server_error = err.message;
+
                 if (err.message === "Invalid RootId parameter") {
                     if ($('#post_deleted').length > 0) $('#post_deleted').modal('show');
                 }
+                else {
+                    this.setState(state);
+                }
             }.bind(this)
         );
     },
-- 
cgit v1.2.3-1-g7c22