summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2016-01-12 11:27:58 +0100
committerAaron Bohy <aab@odoo.com>2016-01-14 11:22:26 +0100
commit8397abd87148c628edec4e7279f8a6dc6b8564b9 (patch)
tree5c13f041b0565244d5709465db4bedbfd8151cab /addons/mail/static/src/js
parent54396cfa41741b97225728a710900100f906aa75 (diff)
[IMP] mail: make chat windows somehow usable in mobile
Diffstat (limited to 'addons/mail/static/src/js')
-rw-r--r--addons/mail/static/src/js/chat_window.js7
-rw-r--r--addons/mail/static/src/js/window_manager.js5
2 files changed, 10 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js
index 44304b81cda..9f94310f4ff 100644
--- a/addons/mail/static/src/js/chat_window.js
+++ b/addons/mail/static/src/js/chat_window.js
@@ -3,6 +3,7 @@ odoo.define('mail.ChatWindow', function (require) {
var ChatThread = require('mail.ChatThread');
+var config = require('web.config');
var core = require('web.core');
var Widget = require('web.Widget');
@@ -107,8 +108,10 @@ return Widget.extend({
this.trigger("close_chat_session");
},
on_click_fold: function () {
- this.toggle_fold();
- this.trigger("fold_channel", this.channel_id, this.folded);
+ if (config.device.size_class !== config.device.SIZES.XS) {
+ this.toggle_fold();
+ this.trigger("fold_channel", this.channel_id, this.folded);
+ }
},
});
diff --git a/addons/mail/static/src/js/window_manager.js b/addons/mail/static/src/js/window_manager.js
index 393903b751e..e76f4ef5cec 100644
--- a/addons/mail/static/src/js/window_manager.js
+++ b/addons/mail/static/src/js/window_manager.js
@@ -4,6 +4,7 @@ odoo.define('mail.window_manager', function (require) {
var chat_manager = require('mail.chat_manager');
var ExtendedChatWindow = require('mail.ExtendedChatWindow');
+var config = require('web.config');
var core = require('web.core');
var utils = require('web.utils');
var web_client = require('web.web_client');
@@ -162,6 +163,10 @@ function toggle_fold_chat (channel) {
}
function compute_available_slots (nb_windows) {
+ if (config.device.size_class === config.device.SIZES.XS) {
+ display_state.nb_slots = 1; // one chat window full screen in mobile
+ return;
+ }
var width = window.innerWidth;
var nb_slots = Math.floor(width/CHAT_WINDOW_WIDTH);
var space_left = width - (Math.min(nb_slots, nb_windows)*CHAT_WINDOW_WIDTH);