summaryrefslogtreecommitdiffstats
path: root/web/templates
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-01-27 09:22:52 -0500
committerChristopher Speller <crspeller@gmail.com>2016-01-27 09:22:52 -0500
commit18a634a751b2b9b12c90eb581890c85060599180 (patch)
treea0e2f0a96205c77b0ea5bc344e4850b9f14c6edf /web/templates
parentf0e6e7de93715f61ef3055efe29ecc35bfefb35d (diff)
parent41f4cc5a5f59b9100e5fa743fcd6e485ef56ce6d (diff)
downloadchat-18a634a751b2b9b12c90eb581890c85060599180.tar.gz
chat-18a634a751b2b9b12c90eb581890c85060599180.tar.bz2
chat-18a634a751b2b9b12c90eb581890c85060599180.zip
Merge pull request #1990 from hmhealey/plt1722
PLT-1772 Changed page to just reload when another tab logs in
Diffstat (limited to 'web/templates')
-rw-r--r--web/templates/head.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/templates/head.html b/web/templates/head.html
index 14b447325..257877376 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -86,13 +86,13 @@
headers: {
'X-MM-TokenIndex': mm_session_token_index,
'Accept-Language': mm_locale
- }
+ }
});
} else {
$.ajaxSetup({
headers: {
'Accept-Language': mm_locale
- }
+ }
});
}
@@ -116,7 +116,7 @@
}
console.log('detected login from a different tab');
- window.location.href = '/' + window.mm_team.name;
+ location.reload();
}
});
});