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_thread.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_thread.jsx')
-rw-r--r-- | webapp/components/rhs_thread.jsx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx index b001da80a..914a697a5 100644 --- a/webapp/components/rhs_thread.jsx +++ b/webapp/components/rhs_thread.jsx @@ -112,6 +112,10 @@ export default class RhsThread extends React.Component { return true; } + if (nextProps.useMilitaryTime !== this.props.useMilitaryTime) { + return true; + } + if (!Utils.areObjectsEqual(nextState.profiles, this.state.profiles)) { return true; } @@ -243,6 +247,7 @@ export default class RhsThread extends React.Component { user={profile} currentUser={this.props.currentUser} compactDisplay={this.state.compactDisplay} + useMilitaryTime={this.props.useMilitaryTime} /> <div className='post-right-comments-container'> {postsArray.map((comPost) => { @@ -260,6 +265,7 @@ export default class RhsThread extends React.Component { user={p} currentUser={this.props.currentUser} compactDisplay={this.state.compactDisplay} + useMilitaryTime={this.props.useMilitaryTime} /> ); })} @@ -286,5 +292,6 @@ RhsThread.defaultProps = { RhsThread.propTypes = { fromSearch: React.PropTypes.string, isMentionSearch: React.PropTypes.bool, - currentUser: React.PropTypes.object.isRequired + currentUser: React.PropTypes.object.isRequired, + useMilitaryTime: React.PropTypes.bool.isRequired }; |