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

Merge pull request #1438 from florianorben/PLT-924

Browse Source 
PLT-924: Combine sequential messages from same user to look like one …
This commit is contained in:
Christopher Speller
2015-11-17 07:58:20 -05:00
parent 634e4d05ab 38f6382387
commit 1d7c449192
3 changed files with 101 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/react/components/posts_view.jsx
View File

@@ -83,9 +83,14 @@ export default class PostsView extends React.Component {
let hideProfilePic = false;
if (prevPost) {
sameUser = prevPost.user_id === post.user_id && post.create_at - prevPost.create_at <= 1000 * 60 * 5;
const postIsComment = Utils.isComment(post);
const prevPostIsComment = Utils.isComment(prevPost);
const postFromWebhook = Boolean(post.props && post.props.from_webhook);
const prevPostFromWebhook = Boolean(prevPost.props && prevPost.props.from_webhook);
sameRoot = Utils.isComment(post) && (prevPost.id === post.root_id || prevPost.root_id === post.root_id);
sameUser = prevPost.user_id === post.user_id && postFromWebhook === prevPostFromWebhook &&
post.create_at - prevPost.create_at <= 1000 * 60 * 5;
sameRoot = (postIsComment && (prevPost.id === post.root_id || prevPost.root_id === post.root_id)) || (!postIsComment && !prevPostIsComment && sameUser);
// hide the profile pic if:
// the previous post was made by the same user as the current post,
@@ -94,10 +99,10 @@ export default class PostsView extends React.Component {
// the current post is not from a webhook
// and the previous post is not from a webhook
if ((prevPost.user_id === post.user_id) &&
!Utils.isComment(prevPost) &&
!Utils.isComment(post) &&
(!post.props || !post.props.from_webhook) &&
(!prevPost.props || !prevPost.props.from_webhook)) {
!prevPostIsComment &&
!postIsComment &&
!postFromWebhook &&
!prevPostFromWebhook) {
hideProfilePic = true;
}
}

22
web/sass-files/sass/partials/_post.scss
View File

@@ -393,6 +393,15 @@ body.ios {
.post-body {
@include border-radius(0 4px 4px 0);
}
.post-body {
border-left: 4px solid #EEE;
width: 570px;
margin-left: 30px;
padding-left: 10px;
.post-link {
display: none;
}
}
}
}
&.same--root {
@@ -408,13 +417,12 @@ body.ios {
.post__content {
padding: 0;
}
.post-body {
border-left: 4px solid #EEE;
width: 570px;
margin-left: 30px;
padding-left: 10px;
.post-link {
display: none;
&.same--user {
.post__content {
padding-left: 46px;
}
.post-header-post {
visibility: hidden;
}
}
}

118
web/sass-files/sass/partials/_responsive.scss
View File

@@ -9,25 +9,26 @@
}
}
.post {
&.same--root {
margin-left: 60px;
padding-left: 10px;
border-left: 4px solid #EEE;
div.post-profile-img__container {
.post-profile-img {
display: none;
}
}
.post__content {
width: 825px;
}
.post-body {
width: 736px;
border: none;
margin: 3px 0 0;
}
}
&.post--comment {
&.same--root {
margin-left: 104px;
padding-left: 10px;
border-left: 4px solid #EEE;
div.post-profile-img__container {
.post-profile-img {
display: none;
}
}
.post__content {
width: 825px;
margin-left: 0;
}
.post-body {
width: 736px;
border: none;
margin: 3px 0 0;
}
}
&.other--root {
.post-comment {
margin-left: 0;
@@ -105,34 +106,61 @@
}
}
.post {
&.same--root {
margin-left: 60px;
padding-left: 10px;
border-left: 4px solid #EEE;
div.post-profile-img__container {
.post-profile-img {
display: none;
}
}
.post__content {
width: 825px;
}
.post-body {
width: 736px;
border: none;
margin: 3px 0 0;
}
}
&.same--root.same--user {
.post-header-post {
visibility: hidden;
width: 100%;
position: relative;
top: -5px;
.post-header-col.post-header__name {
display: none;
}
}
.post-body {
top: -15px;
margin-bottom: -10px;
}
&:hover .post-header-post {
visibility: visible;
}
}
&.post--comment {
&.other--root {
.post-comment {
margin-left: 0;
}
}
&.same--root {
margin-top: 5px;
margin-bottom: 5px;
}
&.same--root {
margin-top: 5px;
margin-bottom: 5px;
margin-left: 104px;
padding-left: 10px;
border-left: 4px solid #EEE;
div.post-profile-img__container {
.post-profile-img {
display: none;
}
}
.post-body {
margin-left: 0;
border-left: 0;
}
&.same--user {
.post__content {
margin-left: 0;
padding-left: 0;
}
}
}
.post__content {
width: 810px;
}
.post-body {
width: 736px;
border: none;
margin: 3px 0 0;
}
}
.post__content {
width: 880px;
@@ -358,9 +386,6 @@
}
}
.post {
&.same--root {
margin-left: 25px;
}
&:hover {
background: none;
.post-header .post-header-col.post-header__reply {
@@ -370,7 +395,11 @@
}
}
&.post--comment {
&.same--root {
margin-left: 25px;
}
&.other--root {
margin-left: 0;
&:hover {
background: none;
}
@@ -381,6 +410,9 @@
content: '...';
}
}
&.same--root.same--user .post__content{
padding-left: 0;
}
}
.signup-team__container {
padding: 30px 0;