diff options
author | François Schmidts <francois.schmidts@gmail.com> | 2016-01-30 01:44:13 +0100 |
---|---|---|
committer | François Schmidts <francois.schmidts@gmail.com> | 2016-01-30 01:44:13 +0100 |
commit | f334fb4b355d90cbf0b8d9e658a87ebeec7fbe90 (patch) | |
tree | 9070ef12da288a3138fb261320e522b47c3803f5 /src/web/js/components/MiddlePanel.react.js | |
parent | displaying date on middle panel (diff) | |
download | newspipe-f334fb4b355d90cbf0b8d9e658a87ebeec7fbe90.tar.gz newspipe-f334fb4b355d90cbf0b8d9e658a87ebeec7fbe90.tar.bz2 newspipe-f334fb4b355d90cbf0b8d9e658a87ebeec7fbe90.zip |
wip redoing feed panel
Diffstat (limited to 'src/web/js/components/MiddlePanel.react.js')
-rw-r--r-- | src/web/js/components/MiddlePanel.react.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/web/js/components/MiddlePanel.react.js b/src/web/js/components/MiddlePanel.react.js index 6b3eb427..6bfdaaa9 100644 --- a/src/web/js/components/MiddlePanel.react.js +++ b/src/web/js/components/MiddlePanel.react.js @@ -1,6 +1,4 @@ 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'); @@ -11,8 +9,9 @@ var MiddlePanelStore = require('../stores/MiddlePanelStore'); var MiddlePanelActions = require('../actions/MiddlePanelActions'); var RightPanelActions = require('../actions/RightPanelActions'); +var JarrTime = require('./time.react'); + 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, @@ -49,11 +48,10 @@ var TableLine = React.createClass({ } // 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>{date} + <h5><strong>{title}</strong></h5> + <JarrTime text={this.props.date} + stamp={this.props.timestamp} /> <div>{read} {liked} {this.props.title}</div> </div> ); |