summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2017-09-29 14:04:48 +0200
committerqsm-odoo <qsm@odoo.com>2017-09-29 14:41:41 +0200
commit87f1e360a89eb7617d5fd60cad58a143bea441df (patch)
tree3b8203b8d38d71b3286ef301a4886595341b7c7a /addons/mail/static/src/js
parent34a7d9a1fb00cf369cebdddfa7ffe217d603542f (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')
-rw-r--r--addons/mail/static/src/js/chat_manager.js6
-rw-r--r--addons/mail/static/src/js/chat_window.js4
-rw-r--r--addons/mail/static/src/js/client_action_mobile.js2
-rw-r--r--addons/mail/static/src/js/composer.js2
-rw-r--r--addons/mail/static/src/js/systray.js2
-rw-r--r--addons/mail/static/src/js/window_manager.js2
6 files changed, 9 insertions, 9 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,
diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js
index 95988d27424..0c3a2270045 100644
--- a/addons/mail/static/src/js/chat_window.js
+++ b/addons/mail/static/src/js/chat_window.js
@@ -43,7 +43,7 @@ return Widget.extend({
this.status = this.options.status;
this.unread_msgs = unread_msgs || 0;
this.is_hidden = false;
- this.isMobile = config.isMobile;
+ this.isMobile = config.device.isMobile;
},
start: function () {
this.$input = this.$('.o_composer_text_field');
@@ -63,7 +63,7 @@ return Widget.extend({
} else if (this.options.autofocus) {
this.focus_input();
}
- if (!config.isMobile) {
+ if (!config.device.isMobile) {
this.$el.css('margin-right', $.position.scrollbarWidth());
}
var def = this.thread.replace(this.$('.o_chat_content'));
diff --git a/addons/mail/static/src/js/client_action_mobile.js b/addons/mail/static/src/js/client_action_mobile.js
index 345a2bccbb2..ecabb94e1ff 100644
--- a/addons/mail/static/src/js/client_action_mobile.js
+++ b/addons/mail/static/src/js/client_action_mobile.js
@@ -10,7 +10,7 @@ var session = require('web.session');
var QWeb = core.qweb;
-if (!config.isMobile) {
+if (!config.device.isMobile) {
return;
}
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index d76fafb34e9..cea77df8816 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -379,7 +379,7 @@ var BasicComposer = Widget.extend(chat_mixin, {
send_text: _t('Send'),
default_body: '',
default_mention_selections: {},
- isMobile: config.isMobile
+ isMobile: config.device.isMobile
});
this.context = this.options.context;
diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js
index 5964248d4fd..4e2476c1d82 100644
--- a/addons/mail/static/src/js/systray.js
+++ b/addons/mail/static/src/js/systray.js
@@ -30,7 +30,7 @@ var MessagingMenu = Widget.extend({
},
init: function () {
this._super.apply(this, arguments);
- this.isMobile = config.isMobile; // used by the template
+ this.isMobile = config.device.isMobile; // used by the template
},
start: function () {
this.$filter_buttons = this.$('.o_filter_button');
diff --git a/addons/mail/static/src/js/window_manager.js b/addons/mail/static/src/js/window_manager.js
index a08b4f5052b..28bf4ad71e9 100644
--- a/addons/mail/static/src/js/window_manager.js
+++ b/addons/mail/static/src/js/window_manager.js
@@ -272,7 +272,7 @@ function render_hidden_sessions_dropdown () {
sessions: display_state.hidden_sessions,
open: display_state.windows_dropdown_is_open,
unread_counter: display_state.hidden_unread_counter,
- widget: {isMobile: config.isMobile},
+ widget: {isMobile: config.device.isMobile},
}));
return $dropdown;
}