diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-06-15 08:13:17 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-15 08:13:17 -0400 |
commit | ba77aefe02159325752cfa79210f5e4b5fcef77e (patch) | |
tree | 48d41a615a07e6867a36baaa78d227a87e422348 /webapp/components/rhs_comment.jsx | |
parent | 3f4d38f58ae086c6570bea7082f25cbdbc52c85d (diff) | |
download | chat-ba77aefe02159325752cfa79210f5e4b5fcef77e.tar.gz chat-ba77aefe02159325752cfa79210f5e4b5fcef77e.tar.bz2 chat-ba77aefe02159325752cfa79210f5e4b5fcef77e.zip |
PLT-3202 Re-render timestamps when display settings switch between 12h and 24h (#3337)
* Made post timestamp switch from 12h to 24h without refreshing
* Made RHS post timestamps switch from 12h to 24h without refreshing
Diffstat (limited to 'webapp/components/rhs_comment.jsx')
-rw-r--r-- | webapp/components/rhs_comment.jsx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 0ef2348d0..7b754c04f 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -38,6 +38,11 @@ export default class RhsComment extends React.Component { if (nextProps.compactDisplay !== this.props.compactDisplay) { return true; } + + if (nextProps.useMilitaryTime !== this.props.useMilitaryTime) { + return true; + } + if (!Utils.areObjectsEqual(nextProps.post, this.props.post)) { return true; } @@ -231,7 +236,7 @@ export default class RhsComment extends React.Component { day='numeric' month='long' year='numeric' - hour12={!Utils.isMilitaryTime()} + hour12={!this.props.useMilitaryTime} hour='2-digit' minute='2-digit' /> @@ -259,5 +264,6 @@ RhsComment.propTypes = { post: React.PropTypes.object, user: React.PropTypes.object.isRequired, currentUser: React.PropTypes.object.isRequired, - compactDisplay: React.PropTypes.bool + compactDisplay: React.PropTypes.bool, + useMilitaryTime: React.PropTypes.bool.isRequired }; |