diff options
Diffstat (limited to 'web/templates/head.html')
| -rw-r--r-- | web/templates/head.html | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 2bbf921ee..be4ed2b25 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -24,20 +24,22 @@ <link rel="stylesheet" href="/static/css/bootstrap-colorpicker.min.css"> <link rel="stylesheet" href="/static/css/styles.css"> <link rel="stylesheet" href="/static/css/google-fonts.css"> + <link rel="stylesheet" href="/static/css/katex.min.css"> <link rel="stylesheet" class="code_theme" href=""> <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon"> - <script src="/static/js/react-0.14.0.js"></script> - <script src="/static/js/react-dom-0.14.0.js"></script> + <script src="/static/js/react-0.14.3.js"></script> + <script src="/static/js/react-dom-0.14.3.js"></script> <script src="/static/js/jquery-2.1.4.js"></script> <script src="/static/js/bootstrap-3.3.5.js"></script> <script src="/static/js/bootstrap-colorpicker.min.js"></script> - <script src="/static/js/react-bootstrap-0.27.1.js"></script> + <script src="/static/js/react-bootstrap-0.28.1.js"></script> <script src="/static/js/perfect-scrollbar-0.6.7.jquery.min.js"></script> <script src="/static/js/jquery-dragster/jquery.dragster.js"></script> - <script src="/static/js/babel-es6-polyfill.min.js"></script> + <script src="/static/js/babel-polyfill-6.1.18.min.js"></script> + <script src="/static/js/katex.min.js"></script> <style id="antiClickjack">body{display:none !important;}</style> @@ -45,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}}; @@ -55,7 +58,13 @@ $(function () { $(window).bind('storage', function (e) { - if (e.originalEvent.key === '__logout__') { + // when one tab on a browser logs out, it sets __logout__ in localStorage to trigger other tabs to log out + if (e.originalEvent.key === '__logout__' && e.originalEvent.storageArea === localStorage && e.originalEvent.newValue) { + // make sure it isn't this tab that is sending the logout signal (only necessary for IE11) + if (window.BrowserStore.isSignallingLogout(e.originalEvent.newValue)) { + return; + } + console.log('detected logout from a different tab'); window.location.href = '/' + window.mm_team.name; } |