Fixing logging errors for Franz (mattermost#7273)

stevepartridge · Aug 22, 2017 · 6456441 · 6456441
1 parent 9e8b3ff
commit 6456441
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/utils/utils.jsx b/utils/utils.jsx
@@ -122,33 +122,35 @@ export function notifyMe(title, body, channel, teamId, duration, silent) {
  if (Notification.permission === 'granted' || (Notification.permission === 'default' && !requestedNotificationPermission)) {
  requestedNotificationPermission = true;
 
- Notification.requestPermission((permission) => {
- if (permission === 'granted') {
- try {
- var notification = new Notification(title, {body, tag: body, icon: icon50, requireInteraction: notificationDuration === 0, silent});
- notification.onclick = () => {
- window.focus();
- if (channel && (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL)) {
- browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name);
- } else if (channel) {
- browserHistory.push(TeamStore.getTeamUrl(teamId) + '/channels/' + channel.name);
- } else if (teamId) {
- browserHistory.push(TeamStore.getTeamUrl(teamId) + '/channels/town-square');
- } else {
- browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square');
+ if (typeof Notification.requestPermission === 'function') {
+ Notification.requestPermission((permission) => {
+ if (permission === 'granted') {
+ try {
+ var notification = new Notification(title, {body, tag: body, icon: icon50, requireInteraction: notificationDuration === 0, silent});
+ notification.onclick = () => {
+ window.focus();
+ if (channel && (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL)) {
+ browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name);
+ } else if (channel) {
+ browserHistory.push(TeamStore.getTeamUrl(teamId) + '/channels/' + channel.name);
+ } else if (teamId) {
+ browserHistory.push(TeamStore.getTeamUrl(teamId) + '/channels/town-square');
+ } else {
+ browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square');
+ }
+ };
+
+ if (notificationDuration > 0) {
+ setTimeout(() => {
+ notification.close();
+ }, notificationDuration);
  }
- };
-
- if (notificationDuration > 0) {
- setTimeout(() => {
- notification.close();
- }, notificationDuration);
+ } catch (e) {
+ console.error(e); //eslint-disable-line no-console
  }
- } catch (e) {
- console.error(e); //eslint-disable-line no-console
  }
- }
- });
+ });
+ }
  }
 }