diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-26 15:10:08 -0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-26 15:10:08 -0500 |
| commit | f6540c4b5e349b3f6d4b807d698ac2c548b4fdb1 (patch) | |
| tree | feb1ac4f79d2987d2b3e933afa03e930685d11e6 /web/templates | |
| parent | 163bab98b5662b34515c70ecb86ea625742b9fea (diff) | |
| parent | c889d9bee107c61513f037fa2f66bf3a0d3fcb42 (diff) | |
| download | chat-f6540c4b5e349b3f6d4b807d698ac2c548b4fdb1.tar.gz chat-f6540c4b5e349b3f6d4b807d698ac2c548b4fdb1.tar.bz2 chat-f6540c4b5e349b3f6d4b807d698ac2c548b4fdb1.zip | |
Merge pull request #1978 from hmhealey/plt1484
PLT-1484 Changed first preference load to be done synchronously
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/channel.html | 2 | ||||
| -rw-r--r-- | web/templates/head.html | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/web/templates/channel.html b/web/templates/channel.html index dcc50115b..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 }}, {{ .User }}); + 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}}; |