diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-23 10:01:45 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-23 10:01:45 -0500 |
| commit | 4b3a3941e04803539f39c057a5c0d44cd30699be (patch) | |
| tree | fb6324a5896da7123b76854e7eb504c239113824 /web/templates | |
| parent | 5ee226d7f92d9408736b0e2a9ff105eb6f520a19 (diff) | |
| parent | 9e8cd937908d5d2e730e94f761d6533eb2d95e28 (diff) | |
| download | chat-4b3a3941e04803539f39c057a5c0d44cd30699be.tar.gz chat-4b3a3941e04803539f39c057a5c0d44cd30699be.tar.bz2 chat-4b3a3941e04803539f39c057a5c0d44cd30699be.zip | |
Merge pull request #1475 from mattermost/plt-90
PLT-90 PLT-88 PLT-1109 PLT-1167 Implementing Permalinks, Jump to post from search, Performace Improvements.
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/channel.html | 2 | ||||
| -rw-r--r-- | web/templates/head.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/web/templates/channel.html b/web/templates/channel.html index c15cea178..33bb252b1 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -33,7 +33,7 @@ <div id="removed_from_channel_modal"></div> <div id="register_app_modal"></div> <script> - window.setup_channel_page({{ .Props }}); +window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}, {{ .User }}); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); if($(window).height() > 1200){ $('.modal-body').css('max-height', 1000); diff --git a/web/templates/head.html b/web/templates/head.html index 30a83c4f2..ec06ba9bc 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -47,6 +47,7 @@ window.mm_config = {{ .ClientCfg }}; window.mm_team = {{ .Team }}; window.mm_user = {{ .User }}; + window.mm_channel = {{ .Channel }}; if ({{.SessionTokenIndex}} >= 0) { window.mm_session_token_index = {{.SessionTokenIndex}}; |