diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-12-08 08:16:15 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-08 08:16:15 -0500 |
| commit | 38c313c93472fc9d2a313212985f02e8d033c2cc (patch) | |
| tree | 55d20e4738a9b8107861ad474f4149887b437b3e /web/react/components | |
| parent | c67c937388309752231a90824876ddc269debebb (diff) | |
| parent | c440f253ddd123de909356bac366648372edbee8 (diff) | |
| download | chat-38c313c93472fc9d2a313212985f02e8d033c2cc.tar.gz chat-38c313c93472fc9d2a313212985f02e8d033c2cc.tar.bz2 chat-38c313c93472fc9d2a313212985f02e8d033c2cc.zip | |
Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visit
fix font not being changed on first page visit (if preferences havent been loaded before)
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/channel_loader.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 13045d732..0d1d9efd7 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -70,6 +70,7 @@ export default class ChannelLoader extends React.Component { Utils.applyTheme(Constants.THEMES.default); } + // if preferences have already been stored in local storage do not wait until preference store change is fired and handled in channel.jsx const selectedFont = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'selected_font', {value: Constants.DEFAULT_FONT}).value; Utils.applyFont(selectedFont); |