From 4cc9bfce5c8bf09f743f00421f47349b6519a25f Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Sat, 11 Jul 2015 08:32:02 -0700
Subject: [webui] fix loading animation for ie

---
 web/react/components/post_body.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/post_body.jsx')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7d5ef4d33..cf542a98f 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -120,7 +120,7 @@ module.exports = React.createClass({
         return (
             <div className="post-body">
                 { comment }
-                <p key={post.Id+"_message"} className={postClass}><span>{inner}</span></p>
+                <p key={post.id+"_message"} className={postClass}><span>{inner}</span></p>
                 { filenames && filenames.length > 0 ?
                     <div className="post-image__columns">
                         { postFiles }
-- 
cgit v1.2.3-1-g7c22


From 3d56d9b2411fdf6db6228dee5dab3fad377a31c4 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 13 Jul 2015 14:56:54 -0700
Subject: Add processing for messageless image posts w/ pluralization

---
 web/react/components/post_body.jsx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'web/react/components/post_body.jsx')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7d5ef4d33..2febcfa04 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -71,11 +71,22 @@ module.exports = React.createClass({
                 name = <a className="theme" onClick={function(){ utils.searchForTerm(profile.username); }}>{profile.username}</a>;
             }
 
-            var message = parentPost.message;
+            var message = ""
+            if(parentPost.message) {
+                message = utils.replaceHtmlEntities(parentPost.message)
+            } else if (parentPost.filenames.length) {
+                message = <a parentPost.filenames[0].split('/').pop();
+
+                if (parentPost.filenames.length === 2) {
+                    message += " plus 1 other file";
+                } else if (parentPost.filenames.length > 2) {
+                    message += " plus " + (parentPost.filenames.length - 1) + " other files";
+                }
+            }
 
             comment = (
                 <p className="post-link">
-                    <span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{utils.replaceHtmlEntities(message)}</a></span>
+                    <span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{message}</a></span>
                 </p>
             );
 
-- 
cgit v1.2.3-1-g7c22


From fa4ac0c7890aa148122407feb2575470336099e1 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 14 Jul 2015 12:08:00 -0700
Subject: Fixed minor typo

---
 web/react/components/post_body.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/post_body.jsx')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 2febcfa04..5f7dbe6c9 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -75,7 +75,7 @@ module.exports = React.createClass({
             if(parentPost.message) {
                 message = utils.replaceHtmlEntities(parentPost.message)
             } else if (parentPost.filenames.length) {
-                message = <a parentPost.filenames[0].split('/').pop();
+                message = parentPost.filenames[0].split('/').pop();
 
                 if (parentPost.filenames.length === 2) {
                     message += " plus 1 other file";
-- 
cgit v1.2.3-1-g7c22

