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 out of order posts for admins plus two minor fixes (#6886)

Browse Source
This commit is contained in:
Joram Wilander
2017-07-10 13:58:01 -04:00
committed by Saturnino Abril
parent 9a7453e208
commit 45e7ad0c34
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/actions/emoji_actions.jsx
View File

@@ -13,7 +13,7 @@ import {getProfilesByIds} from 'mattermost-redux/actions/users';
import * as EmojiActions from 'mattermost-redux/actions/emojis';
export async function loadEmoji(getProfiles = true) {
const data = await EmojiActions.getAllCustomEmojis(10000)(dispatch, getState);
const data = await EmojiActions.getAllCustomEmojis()(dispatch, getState);
if (data && getProfiles) {
loadProfilesForEmoji(data);

21
webapp/components/post_view/post_list.jsx
View File

@@ -104,6 +104,7 @@ export default class PostList extends React.PureComponent {
this.previousScrollTop = Number.MAX_SAFE_INTEGER;
this.previousScrollHeight = 0;
this.previousClientHeight = 0;
this.atBottom = false;
this.state = {
atEnd: false,
@@ -144,6 +145,7 @@ export default class PostList extends React.PureComponent {
this.hasScrolled = false;
this.hasScrolledToFocusedPost = false;
this.hasScrolledToNewMessageSeparator = false;
this.atBottom = false;
this.setState({atEnd: false});
if (nextChannel.id) {
@@ -152,7 +154,7 @@ export default class PostList extends React.PureComponent {
return;
}
if (!this.wasAtBottom() && this.props.posts !== nextProps.posts && this.hasScrolledToNewMessageSeparator) {
if (!this.atBottom && this.props.posts !== nextProps.posts && this.hasScrolledToNewMessageSeparator) {
const unViewedCount = nextProps.posts.reduce((count, post) => {
if (post.create_at > this.state.lastViewed &&
post.user_id !== nextProps.currentUserId &&
@@ -206,6 +208,7 @@ export default class PostList extends React.PureComponent {
return;
} else if (postList && !this.hasScrolledToNewMessageSeparator) {
postList.scrollTop = postList.scrollHeight;
this.atBottom = true;
return;
}
@@ -218,7 +221,7 @@ export default class PostList extends React.PureComponent {
const pendingPostId = posts[0].pending_post_id;
if (postId !== prevPostId && pendingPostId !== prevPostId) {
// If already scrolled to bottom
if (this.wasAtBottom()) {
if (this.atBottom) {
doScrollToBottom = true;
}
@@ -229,6 +232,7 @@ export default class PostList extends React.PureComponent {
}
if (doScrollToBottom) {
this.atBottom = true;
postList.scrollTop = postList.scrollHeight;
return;
}
@@ -246,13 +250,13 @@ export default class PostList extends React.PureComponent {
});
}
wasAtBottom = () => {
return this.previousClientHeight + this.previousScrollTop >= this.previousScrollHeight - CLOSE_TO_BOTTOM_SCROLL_MARGIN;
checkBottom = () => {
return this.refs.postlist.clientHeight + this.refs.postlist.scrollTop >= this.refs.postlist.scrollHeight - CLOSE_TO_BOTTOM_SCROLL_MARGIN;
}
handleResize = (forceScrollToBottom) => {
const postList = this.refs.postlist;
const doScrollToBottom = this.wasAtBottom() || forceScrollToBottom;
const doScrollToBottom = this.atBottom || forceScrollToBottom;
if (postList && doScrollToBottom) {
postList.scrollTop = postList.scrollHeight;
@@ -298,6 +302,9 @@ export default class PostList extends React.PureComponent {
handleScroll = () => {
this.hasScrolled = true;
this.previousScrollTop = this.refs.postlist.scrollTop;
if (this.refs.postlist.scrollHeight === this.previousScrollHeight) {
this.atBottom = this.checkBottom();
}
this.updateFloatingTimestamp();
@@ -307,7 +314,7 @@ export default class PostList extends React.PureComponent {
});
}
if (this.wasAtBottom()) {
if (this.atBottom) {
this.setState({
lastViewed: new Date().getTime(),
unViewedCount: 0,
@@ -509,7 +516,7 @@ export default class PostList extends React.PureComponent {
/>
<ScrollToBottomArrows
isScrolling={this.state.isScrolling}
atBottom={this.wasAtBottom()}
atBottom={this.atBottom}
onClick={this.scrollToBottom}
/>
<NewMessageIndicator

2
webapp/package.json
View File

@@ -24,7 +24,7 @@
"localforage": "1.5.0",
"marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317",
"match-at": "0.1.0",
"mattermost-redux": "mattermost/mattermost-redux#webapp-master",
"mattermost-redux": "mattermost/mattermost-redux#webapp-4.0",
"object-assign": "4.1.1",
"pdfjs-dist": "1.8.474",
"perfect-scrollbar": "0.7.1",

4
webapp/yarn.lock
View File

@@ -5041,9 +5041,9 @@ math-expression-evaluator@^1.2.14:
version "1.2.16"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
mattermost-redux@mattermost/mattermost-redux#webapp-master:
mattermost-redux@mattermost/mattermost-redux#webapp-4.0:
version "0.0.1"
resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/b4bab66d36f10ace06bcd3243d68807bfbca9c48"
resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/cb3aee571a78c835ed0ff5629114e05fce41a5f5"
dependencies:
deep-equal "1.0.1"
harmony-reflect "1.5.1"