summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-02 17:16:10 -0400
committerCorey Hulen <corey@hulen.com>2016-05-02 14:16:10 -0700
commit95de1468acfffb08fb4da170613b985d1e1b5b61 (patch)
tree52f3aec184b983d442243bff859304983e784590
parent8125f3ca363b76772b0dee18c6ba39cfb9fd6014 (diff)
downloadchat-95de1468acfffb08fb4da170613b985d1e1b5b61.tar.gz
chat-95de1468acfffb08fb4da170613b985d1e1b5b61.tar.bz2
chat-95de1468acfffb08fb4da170613b985d1e1b5b61.zip
Reverted New Messages indicator in center channel (#2853)
-rw-r--r--webapp/components/posts_view.jsx20
-rw-r--r--webapp/sass/layout/_post.scss27
2 files changed, 0 insertions, 47 deletions
diff --git a/webapp/components/posts_view.jsx b/webapp/components/posts_view.jsx
index fc36e3261..0515b696c 100644
--- a/webapp/components/posts_view.jsx
+++ b/webapp/components/posts_view.jsx
@@ -50,7 +50,6 @@ export default class PostsView extends React.Component {
centerPosts: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_CENTERED,
isScrolling: false,
topPostId: null,
- showUnreadMessageAlert: false,
currentUser: UserStore.getCurrentUser(),
profiles: UserStore.getProfiles()
};
@@ -409,13 +408,6 @@ export default class PostsView extends React.Component {
}
}
componentWillReceiveProps(nextProps) {
- if (this.props.postList && this.props.postList.order.length) {
- if (this.props.postList.order[0] !== nextProps.postList.order[0] && nextProps.scrollType !== PostsView.SCROLL_TYPE_BOTTOM && nextProps.scrollType !== PostsView.SCROLL_TYPE_NEW_MESSAGE && nextProps.postList.posts[nextProps.postList.order[0]].user_id !== nextProps.currentUser.id && this.props.postList.order[1] !== nextProps.postList.order[0]) { // new message from another user and not deleted
- this.setState({showUnreadMessageAlert: true});
- } else if (nextProps.scrollType === PostsView.SCROLL_TYPE_BOTTOM) {
- this.setState({showUnreadMessageAlert: false});
- }
- }
if (!this.props.isActive && nextProps.isActive) {
this.updateState();
PreferenceStore.addChangeListener(this.updateState);
@@ -550,18 +542,6 @@ export default class PostsView extends React.Component {
</div>
</div>
</div>
- <div
- className='post-list__new-messages-below'
- onClick={this.scrollToBottomAnimated}
- hidden={!this.state.showUnreadMessageAlert}
- >
- <i className='fa fa-angle-down'></i>
- &nbsp;
- <FormattedMessage
- id='posts_view.newMsg'
- defaultMessage='New Messages'
- />
- </div>
</div>
);
}
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 3ba5926ef..22b19d539 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -170,33 +170,6 @@ body.ios {
}
}
-.post-list__new-messages-below {
- @include single-transition(bottom .5s cubic-bezier(86, 0, 07, 1));
- @include opacity(.9);
- background-color: $black;
- border-radius: 1em;
- bottom: 10px;
- color: $white;
- cursor: pointer;
- display: inline-block;
- left: 50%;
- padding: .3em .75em;
- position: absolute;
- transform: translateX(-50%);
-
- &[hidden] {
- bottom: -30px;
- }
-
- .fa {
- font-size: 17px;
- font-weight: bold;
- margin-right: 1px;
- position: relative;
- top: 1px;
- }
-}
-
.file-overlay {
color: $white;
font-size: em(20px);