From 95de1468acfffb08fb4da170613b985d1e1b5b61 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 2 May 2016 17:16:10 -0400 Subject: Reverted New Messages indicator in center channel (#2853) --- webapp/components/posts_view.jsx | 20 -------------------- webapp/sass/layout/_post.scss | 27 --------------------------- 2 files changed, 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 { - ); } 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); -- cgit v1.2.3-1-g7c22