diff options
| author | qsm-odoo <qsm@odoo.com> | 2017-09-29 14:04:48 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-09-29 14:41:41 +0200 |
| commit | 87f1e360a89eb7617d5fd60cad58a143bea441df (patch) | |
| tree | 3b8203b8d38d71b3286ef301a4886595341b7c7a /addons/mail/static/src/js/chat_manager.js | |
| parent | 34a7d9a1fb00cf369cebdddfa7ffe217d603542f (diff) | |
[FIX] web, mail, base: config's `isMobile` definition
The `isMobile` variable was defined at the right place (`config.device`)
but was set at the wrong place (`config`).
Thank you for making me author of all the `isMobile` lines by
the way... :)
Diffstat (limited to 'addons/mail/static/src/js/chat_manager.js')
| -rw-r--r-- | addons/mail/static/src/js/chat_manager.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index a868137d95b..9d1b9cddb70 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -100,7 +100,7 @@ function add_message (data, options) { update_channel_unread_counter(channel, channel.unread_counter+1); } if (channel.is_chat && options.show_notification) { - if (!client_action_open && !config.isMobile) { + if (!client_action_open && !config.device.isMobile) { // automatically open chat window chat_manager.bus.trigger('open_chat', channel, { passively: true }); } @@ -646,7 +646,7 @@ var ChatManager = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, { start: function () { this.is_ready = session.is_bound.then(function(){ - var context = _.extend({isMobile: config.isMobile}, session.user_context); + var context = _.extend({isMobile: config.device.isMobile}, session.user_context); return session.rpc('/mail/client_action', {context: context}); }).then(this._onMailClientAction.bind(this)); @@ -1032,7 +1032,7 @@ var ChatManager = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, { create_channel: function (name, type) { var method = type === "dm" ? "channel_get" : "channel_create"; var args = type === "dm" ? [[name]] : [name, type]; - var context = _.extend({isMobile: config.isMobile}, session.user_context); + var context = _.extend({isMobile: config.device.isMobile}, session.user_context); return this._rpc({ model: 'mail.channel', method: method, |
