summaryrefslogtreecommitdiffstats
path: root/web/react/components/channel_loader.jsx
diff options
context:
space:
mode:
authorFlorian Orben <florian.orben@gmail.com>2015-11-28 02:54:04 +0100
committerFlorian Orben <florian.orben@gmail.com>2015-11-28 02:54:04 +0100
commit42bf8173bd2dca7cb6c33c2df98c399958c6ef15 (patch)
treedf50c6217d327ea128e70be5288378ef168ee247 /web/react/components/channel_loader.jsx
parent42a001c4e26acaebb7bade2a9b45428578b04164 (diff)
downloadchat-42bf8173bd2dca7cb6c33c2df98c399958c6ef15.tar.gz
chat-42bf8173bd2dca7cb6c33c2df98c399958c6ef15.tar.bz2
chat-42bf8173bd2dca7cb6c33c2df98c399958c6ef15.zip
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.jsx4
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');