diff options
| -rw-r--r-- | web/react/components/channel_notifications.jsx | 4 | ||||
| -rw-r--r-- | web/react/utils/client.jsx | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx index 638d16576..38bc91682 100644 --- a/web/react/components/channel_notifications.jsx +++ b/web/react/components/channel_notifications.jsx @@ -16,12 +16,12 @@ module.exports = React.createClass({ var self = this; $(this.refs.modal.getDOMNode()).on('show.bs.modal', function(e) { var button = e.relatedTarget; - var channel_id = button.dataset.channelid; + var channel_id = button.getAttribute('data-channelid'); var notifyLevel = ChannelStore.getMember(channel_id).notify_level; var quietMode = false; if (notifyLevel === "quiet") quietMode = true; - self.setState({ notify_level: notifyLevel, quiet_mode: quietMode, title: button.dataset.title, channel_id: channel_id }); + self.setState({ notify_level: notifyLevel, quiet_mode: quietMode, title: button.getAttribute('data-title'), channel_id: channel_id }); }); }, componentWillUnmount: function() { 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); + }; }; } }); |