Merge pull request #1604 from hmhealey/plt1285

PLT-1285 Fixed IE11 tabs preventing themselves from logging out

1 files changed, 7 insertions, 1 deletions

diff --git a/web/templates/head.html b/web/templates/head.html
index 709edbaec..be4ed2b25 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -58,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;
                 }