diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-04-18 18:37:24 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-04-18 18:37:24 +0200 |
| commit | 39ab200cd3d2dc13f0499850d98f12f96fdcc67c (patch) | |
| tree | fa792ea5f882f2d023aefb2d721c03fe364b20c7 /addons/mail/static/src/js | |
| parent | 05a33052747da7767fb6c3db160126d37520381a (diff) | |
| parent | 780064ea89dda478fe04b9e92daaffc6c76d3ca1 (diff) | |
[MERGE] forward port branch saas-15 up to 780064ea89d
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/client_action.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/utils.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js index b64f7e3490b..fcb6203a1bd 100644 --- a/addons/mail/static/src/js/client_action.js +++ b/addons/mail/static/src/js/client_action.js @@ -119,7 +119,7 @@ var ChatAction = Widget.extend(ControlPanelMixin, { var self = this; event.preventDefault(); this.$(".o_mail_annoying_notification_bar").slideUp(); - var def = window.Notification.requestPermission(); + var def = window.Notification && window.Notification.requestPermission(); if (def) { def.then(function (value) { if (value === 'denied') { diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js index 4035be0a3df..6364be77eb5 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -5,7 +5,7 @@ var bus = require('bus.bus').bus; function send_notification(widget, title, content) { - if (Notification && Notification.permission === "granted") { + if (window.Notification && Notification.permission === "granted") { if (bus.is_master) { _send_native_notification(title, content); } |