diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2016-01-26 09:52:26 -0500 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2016-01-26 13:58:23 -0500 |
| commit | c889d9bee107c61513f037fa2f66bf3a0d3fcb42 (patch) | |
| tree | feb1ac4f79d2987d2b3e933afa03e930685d11e6 | |
| parent | a6c97490b3c6b7bca00d16bc436abf902ee7b101 (diff) | |
| download | chat-c889d9bee107c61513f037fa2f66bf3a0d3fcb42.tar.gz chat-c889d9bee107c61513f037fa2f66bf3a0d3fcb42.tar.bz2 chat-c889d9bee107c61513f037fa2f66bf3a0d3fcb42.zip | |
Moved PreferenceStore initialization into head.html
| -rw-r--r-- | web/react/pages/channel.jsx | 6 | ||||
| -rw-r--r-- | web/templates/channel.html | 2 | ||||
| -rw-r--r-- | web/templates/head.html | 5 |
3 files changed, 7 insertions, 6 deletions
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') diff --git a/web/templates/channel.html b/web/templates/channel.html index 373707499..94d79a022 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -6,7 +6,7 @@ <body> <div id="channel_view" class='channel-view'></div> <script> - window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}, {{ .Preferences }}); + window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); var modals = $('.modal-body').not('.edit-modal-body'); if($(window).height() > 1200){ diff --git a/web/templates/head.html b/web/templates/head.html index fc16eb2dc..14b447325 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -74,6 +74,11 @@ window.mm_user = {{ .User }}; window.mm_channel = {{ .Channel }}; window.mm_locale = {{ .Locale }}; + window.mm_preferences = {{ .Preferences }}; + + $(function() { + PreferenceStore.setPreferences(window.mm_preferences); + }); if ({{.SessionTokenIndex}} >= 0) { window.mm_session_token_index = {{.SessionTokenIndex}}; |