diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-02 10:18:42 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-02 10:18:42 -0500 |
| commit | 2aa78002fe73d82f67fac83430ce3210749f79a3 (patch) | |
| tree | 489dab3f1efdec3efa6fdaed6224b7e0b0c4c3ff /web/react/components/channel_loader.jsx | |
| parent | 7678d4aafa17a27da897925a169931d1c2cb07fc (diff) | |
| parent | 42bf8173bd2dca7cb6c33c2df98c399958c6ef15 (diff) | |
| download | chat-2aa78002fe73d82f67fac83430ce3210749f79a3.tar.gz chat-2aa78002fe73d82f67fac83430ce3210749f79a3.tar.bz2 chat-2aa78002fe73d82f67fac83430ce3210749f79a3.zip | |
Merge pull request #1535 from florianorben/PLT-1233
PLT-1233: "Display Font" option in Account Settings > Display
Diffstat (limited to 'web/react/components/channel_loader.jsx')
| -rw-r--r-- | web/react/components/channel_loader.jsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index c8f1196a8..13045d732 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -10,6 +10,7 @@ import SocketStore from '../stores/socket_store.jsx'; import ChannelStore from '../stores/channel_store.jsx'; import PostStore from '../stores/post_store.jsx'; import UserStore from '../stores/user_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; import * as Utils from '../utils/utils.jsx'; import Constants from '../utils/constants.jsx'; @@ -69,6 +70,9 @@ export default class ChannelLoader extends React.Component { Utils.applyTheme(Constants.THEMES.default); } + const selectedFont = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'selected_font', {value: Constants.DEFAULT_FONT}).value; + Utils.applyFont(selectedFont); + $('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) { if (ev.type === 'mouseenter') { $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after'); |