IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix preview collapsing in RHS root post (#4677)

Browse Source
This commit is contained in:
Joram Wilander
2016-12-02 12:25:50 -05:00
committed by Christopher Speller
parent ea26c72dad
commit 67c60d236d
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/components/rhs_root_post.jsx
View File

@@ -59,6 +59,10 @@ export default class RhsRootPost extends React.Component {
return true;
}
if (nextProps.previewCollapsed !== this.props.previewCollapsed) {
return true;
}
if (!Utils.areObjectsEqual(nextProps.post, this.props.post)) {
return true;
}
@@ -388,6 +392,7 @@ export default class RhsRootPost extends React.Component {
<PostBodyAdditionalContent
post={post}
message={messageWrapper}
previewCollapsed={this.props.previewCollapsed}
/>
{fileAttachment}
<ReactionListContainer
@@ -413,5 +418,6 @@ RhsRootPost.propTypes = {
compactDisplay: React.PropTypes.bool,
useMilitaryTime: React.PropTypes.bool.isRequired,
isFlagged: React.PropTypes.bool,
status: React.PropTypes.string
status: React.PropTypes.string,
previewCollapsed: React.PropTypes.string
};

16
webapp/components/rhs_thread.jsx
View File

@@ -65,6 +65,7 @@ export default class RhsThread extends React.Component {
state.compactDisplay = PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.MESSAGE_DISPLAY, Preferences.MESSAGE_DISPLAY_DEFAULT) === Preferences.MESSAGE_DISPLAY_COMPACT;
state.flaggedPosts = PreferenceStore.getCategory(Constants.Preferences.CATEGORY_FLAGGED_POST);
state.statuses = Object.assign({}, UserStore.getStatuses());
state.previewsCollapsed = PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.COLLAPSE_DISPLAY, 'false');
this.state = state;
}
@@ -130,6 +131,10 @@ export default class RhsThread extends React.Component {
return true;
}
if (nextState.previewsCollapsed !== this.state.previewsCollapsed) {
return true;
}
if (!Utils.areObjectsEqual(nextState.flaggedPosts, this.state.flaggedPosts)) {
return true;
}
@@ -162,10 +167,16 @@ export default class RhsThread extends React.Component {
});
}
onPreferenceChange() {
onPreferenceChange(category) {
let previewSuffix = '';
if (category === Preferences.CATEGORY_DISPLAY_SETTINGS) {
previewSuffix = '_' + Utils.generateId();
}
this.setState({
compactDisplay: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.MESSAGE_DISPLAY, Preferences.MESSAGE_DISPLAY_DEFAULT) === Preferences.MESSAGE_DISPLAY_COMPACT,
flaggedPosts: PreferenceStore.getCategory(Constants.Preferences.CATEGORY_FLAGGED_POST)
flaggedPosts: PreferenceStore.getCategory(Constants.Preferences.CATEGORY_FLAGGED_POST),
previewsCollapsed: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.COLLAPSE_DISPLAY, 'false') + previewSuffix
});
this.forceUpdateInfo();
}
@@ -300,6 +311,7 @@ export default class RhsThread extends React.Component {
useMilitaryTime={this.props.useMilitaryTime}
isFlagged={isRootFlagged}
status={rootStatus}
previewCollapsed={this.state.previewsCollapsed}
/>
<div className='post-right-comments-container'>
{postsArray.map((comPost) => {