scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-26 17:16:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #157 from rschamp/bugfix/GH-152

Browse source 
Fix #152: Don't output activity without a message
This commit is contained in:
Ray Schamp 2015-10-24 12:25:55 -04:00
commit 21b7386270
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/components/activity/activity.jsx
View file

@ -38,20 +38,21 @@ var Activity = React.createClass({
var actionDate = new Date(item.datetime_created + 'Z'); var actionDate = new Date(item.datetime_created + 'Z');
var activityMessageHTML = '<a href=' + actorProfileUrl + '>' + var activityMessageHTML = '<a href=' + actorProfileUrl + '>' +
item.actor.username + '</a>' + item.message; item.actor.username + '</a>' + item.message;
if (item.message.replace(/\s/g, '')) {
return ( return (
<li key={item.pk}> <li key={item.pk}>
<a href={actorProfileUrl}> <a href={actorProfileUrl}>
<img src={item.actor.thumbnail_url} width="34" height="34" /> <img src={item.actor.thumbnail_url} width="34" height="34" />
<p dangerouslySetInnerHTML={{__html: activityMessageHTML}}></p> <p dangerouslySetInnerHTML={{__html: activityMessageHTML}}></p>
<p> <p>
<span className="stamp"> <span className="stamp">
<FormattedRelative value={actionDate} /> <FormattedRelative value={actionDate} />
</span> </span>
</p> </p>
</a> </a>
</li> </li>
); );
}
})} })}
</ul> </ul>
</Box> </Box>

3
src/views/components/components.jsx
View file

@ -1,6 +1,7 @@
var React = require('react'); var React = require('react');
var render = require('../../lib/render.jsx'); var render = require('../../lib/render.jsx');
var Activity = require('../../components/activity/activity.jsx');
var Box = require('../../components/box/box.jsx'); var Box = require('../../components/box/box.jsx');
var Button = require('../../components/forms/button.jsx'); var Button = require('../../components/forms/button.jsx');
var Carousel = require('../../components/carousel/carousel.jsx'); var Carousel = require('../../components/carousel/carousel.jsx');
@ -32,6 +33,8 @@ var Components = React.createClass({
title="Carousel component in a box!"> title="Carousel component in a box!">
<Carousel /> <Carousel />
</Box> </Box>
<h1>{'What\'s Happening??'}</h1>
<Activity />
</div> </div>
); );
} }