From a6c97490b3c6b7bca00d16bc436abf902ee7b101 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 25 Jan 2016 10:40:29 -0500
Subject: Changed first preference load to be done synchronously

---
 web/react/pages/channel.jsx | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'web/react/pages')

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 1e28dab8b..5bb0294fd 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -20,12 +20,8 @@ import InviteMemberModal from '../components/invite_member_modal.jsx';
 
 import PreferenceStore from '../stores/preference_store.jsx';
 
-import * as Utils from '../utils/utils.jsx';
-import * as AsyncClient from '../utils/async_client.jsx';
 import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 
-import Constants from '../utils/constants.jsx';
-
 var IntlProvider = ReactIntl.IntlProvider;
 
 class Root extends React.Component {
@@ -92,24 +88,17 @@ class Root extends React.Component {
     }
 }
 
-function onPreferenceChange() {
-    const selectedFont = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'selected_font', Constants.DEFAULT_FONT);
-    Utils.applyFont(selectedFont);
-    PreferenceStore.removeChangeListener(onPreferenceChange);
-}
-
-global.window.setup_channel_page = function setup(props, team, channel) {
+global.window.setup_channel_page = function setup(props, team, channel, preferences) {
     if (props.PostId === '') {
         EventHelpers.emitChannelClickEvent(channel);
     } else {
         EventHelpers.emitPostFocusEvent(props.PostId);
     }
 
-    PreferenceStore.addChangeListener(onPreferenceChange);
-    AsyncClient.getAllPreferences();
+    PreferenceStore.setPreferences(preferences);
 
     ReactDOM.render(
         <Root map={props} />,
         document.getElementById('channel_view')
     );
-};
\ No newline at end of file
+};
-- 
cgit v1.2.3-1-g7c22


From c889d9bee107c61513f037fa2f66bf3a0d3fcb42 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 26 Jan 2016 09:52:26 -0500
Subject: Moved PreferenceStore initialization into head.html

---
 web/react/pages/channel.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'web/react/pages')

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 5bb0294fd..bfb95e1fc 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -18,8 +18,6 @@ import RegisterAppModal from '../components/register_app_modal.jsx';
 import ImportThemeModal from '../components/user_settings/import_theme_modal.jsx';
 import InviteMemberModal from '../components/invite_member_modal.jsx';
 
-import PreferenceStore from '../stores/preference_store.jsx';
-
 import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 
 var IntlProvider = ReactIntl.IntlProvider;
@@ -88,15 +86,13 @@ class Root extends React.Component {
     }
 }
 
-global.window.setup_channel_page = function setup(props, team, channel, preferences) {
+global.window.setup_channel_page = function setup(props, team, channel) {
     if (props.PostId === '') {
         EventHelpers.emitChannelClickEvent(channel);
     } else {
         EventHelpers.emitPostFocusEvent(props.PostId);
     }
 
-    PreferenceStore.setPreferences(preferences);
-
     ReactDOM.render(
         <Root map={props} />,
         document.getElementById('channel_view')
-- 
cgit v1.2.3-1-g7c22