diff options
author | François Schmidts <francois.schmidts@gmail.com> | 2016-01-29 21:08:31 +0100 |
---|---|---|
committer | François Schmidts <francois.schmidts@gmail.com> | 2016-01-29 21:08:31 +0100 |
commit | 6d681cba9d4da213d3de727570f17d2361f599de (patch) | |
tree | ee33d4f5cecd00688d8650f98da56d558700196f /src/web/js | |
parent | impact on menus when loading article (diff) | |
download | newspipe-6d681cba9d4da213d3de727570f17d2361f599de.tar.gz newspipe-6d681cba9d4da213d3de727570f17d2361f599de.tar.bz2 newspipe-6d681cba9d4da213d3de727570f17d2361f599de.zip |
displaying date on middle panel
Diffstat (limited to 'src/web/js')
-rw-r--r-- | src/web/js/components/MiddlePanel.react.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/web/js/components/MiddlePanel.react.js b/src/web/js/components/MiddlePanel.react.js index 0bb0b51b..6b3eb427 100644 --- a/src/web/js/components/MiddlePanel.react.js +++ b/src/web/js/components/MiddlePanel.react.js @@ -1,4 +1,7 @@ var React = require('react'); +var ReactIntl = require('react-intl'); +var FormattedRelative = ReactIntl.FormattedRelative; + var Row = require('react-bootstrap/Row'); var Button = require('react-bootstrap/Button'); var ButtonGroup = require('react-bootstrap/ButtonGroup'); @@ -9,10 +12,12 @@ var MiddlePanelActions = require('../actions/MiddlePanelActions'); var RightPanelActions = require('../actions/RightPanelActions'); var TableLine = React.createClass({ + mixins: [ReactIntl.IntlMixin], propTypes: {article_id: React.PropTypes.number.isRequired, feed_title: React.PropTypes.string.isRequired, icon_url: React.PropTypes.string, title: React.PropTypes.string.isRequired, + timestamp: React.PropTypes.number.isRequired, date: React.PropTypes.string.isRequired, read: React.PropTypes.bool.isRequired, selected: React.PropTypes.bool.isRequired, @@ -42,8 +47,13 @@ var TableLine = React.createClass({ if(this.props.selected) { clsses += " active"; } + // FIXME https://github.com/yahoo/react-intl/issues/189 + // use FormattedRelative when fixed, will have to upgrade to ReactIntlv2 + var date = (<time dateTime={this.props.date} title={this.props.date}> + {this.formatRelative(this.props.timestamp)} + </time>); return (<div className={clsses} onClick={this.loadArticle}> - <h5><strong>{title}</strong></h5><div /> + <h5><strong>{title}</strong></h5>{date} <div>{read} {liked} {this.props.title}</div> </div> ); @@ -219,10 +229,12 @@ var MiddlePanel = React.createClass({ icon_url={article.icon_url} read={article.read} liked={article.liked} + timestamp={article.timestamp} date={article.date} selected={article.selected} article_id={article.article_id} feed_id={article.feed_id} + locales={['en']} category_id={article.category_id} feed_title={article.feed_title} />);})} </div> |