diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-07-06 07:31:26 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-06 07:31:26 -0400 |
| commit | b819b492bf3c5d1f2353b086dbf7b70fd6a98869 (patch) | |
| tree | ac327a7663b9f58fcf6c9fadc402f963024bef70 /web/react | |
| parent | 4a3003c0dcf7d642f233493e32b07beed5d08327 (diff) | |
| parent | 6b1ae67f2fdaa096262be54e4d920bd26034cba5 (diff) | |
| download | chat-b819b492bf3c5d1f2353b086dbf7b70fd6a98869.tar.gz chat-b819b492bf3c5d1f2353b086dbf7b70fd6a98869.tar.bz2 chat-b819b492bf3c5d1f2353b086dbf7b70fd6a98869.zip | |
Merge pull request #127 from rgarmsen2295/mm-1047
MM-1047 Error code 200 IE 10 & 11 suppression within getMeSynchronous method
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/utils/client.jsx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 15b6ace91..b4030baac 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -286,9 +286,12 @@ module.exports.getMeSynchronous = function(success, error) { if (success) success(data, textStatus, xhr); }, error: function(xhr, status, err) { - if (error) { - e = handleError("getMeSynchronous", xhr, status, err); - error(e); + var ieChecker = window.navigator.userAgent; // This and the condition below is used to check specifically for browsers IE10 & 11 to suppress a 200 'OK' error from appearing on login + if (xhr.status != 200 || !(ieChecker.indexOf("Trident/7.0") > 0 || ieChecker.indexOf("Trident/6.0") > 0)) { + if (error) { + e = handleError("getMeSynchronous", xhr, status, err); + error(e); + }; }; } }); |