diff options
author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-07-12 17:02:30 +0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-12 08:02:30 -0400 |
commit | 06eacf30b97aacf6544552448635b7f078d2c90b (patch) | |
tree | 7f4bbdf363bc29ce54da83c256fdae72c00d983a /webapp/components | |
parent | 3f0d6ee6a1fde38f51212a123604c5d27da56e79 (diff) | |
download | chat-06eacf30b97aacf6544552448635b7f078d2c90b.tar.gz chat-06eacf30b97aacf6544552448635b7f078d2c90b.tar.bz2 chat-06eacf30b97aacf6544552448635b7f078d2c90b.zip |
PLT-3157 - Adding display width customisation to intro message (#3521)
* PLT-3157 - Adding display width customisation to intro message
* Fixing error
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/post_view/components/post_list.jsx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/webapp/components/post_view/components/post_list.jsx b/webapp/components/post_view/components/post_list.jsx index 17e29da2e..690cd96c7 100644 --- a/webapp/components/post_view/components/post_list.jsx +++ b/webapp/components/post_view/components/post_list.jsx @@ -18,11 +18,15 @@ import DelayedAction from 'utils/delayed_action.jsx'; import Constants from 'utils/constants.jsx'; const ScrollTypes = Constants.ScrollTypes; +import PreferenceStore from 'stores/preference_store.jsx'; + import {FormattedDate, FormattedMessage} from 'react-intl'; import React from 'react'; import ReactDOM from 'react-dom'; +const Preferences = Constants.Preferences; + export default class PostList extends React.Component { constructor(props) { super(props); @@ -44,16 +48,17 @@ export default class PostList extends React.Component { this.scrollStopAction = new DelayedAction(this.handleScrollStop); - if (props.channel) { - this.introText = createChannelIntroMessage(props.channel); - } else { - this.introText = this.getArchivesIntroMessage(); - } - this.state = { isScrolling: false, + fullWidthIntro: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_FULL_SCREEN, topPostId: null }; + + if (props.channel) { + this.introText = createChannelIntroMessage(props.channel, this.state.fullWidthIntro); + } else { + this.introText = this.getArchivesIntroMessage(); + } } isAtBottom() { @@ -395,7 +400,7 @@ export default class PostList extends React.Component { getArchivesIntroMessage() { return ( - <div className='channel-intro'> + <div className={'channel-intro'}> <h4 className='channel-intro__title'> <FormattedMessage id='post_focus_view.beginning' |