diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-12-11 17:40:24 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-12-15 10:01:21 +0100 |
| commit | 17896a92da39d265fda7b0e2f32479a18d0b8ace (patch) | |
| tree | 361cd5a52e7b7f77ce9560cf572dafd213d9a05e /addons/mail/static/src/js/chat_window.js | |
| parent | 1029571c35bf5372318590a439e53e3a881b2308 (diff) | |
[FIX] mail: various ui improvements/fixes
* chat windows:
- input was kicked out of the window on chrome 43
- don't animate if folded by default (e.g. after a refresh)
- width and height 100% like in the frontend
- z-index to make sure that they are over bootstrap active btn,
but below notifications, and modals
* chatter:
- internal note: send button renammed to 'Log'
- send button is the first button again
- remove annoying form view widget's tooltip
* client action: focus on composer on channel change
Diffstat (limited to 'addons/mail/static/src/js/chat_window.js')
| -rw-r--r-- | addons/mail/static/src/js/chat_window.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js index 4edc8a23c44..ca36b430791 100644 --- a/addons/mail/static/src/js/chat_window.js +++ b/addons/mail/static/src/js/chat_window.js @@ -8,6 +8,9 @@ var Widget = require('web.Widget'); var _t = core._t; +var HEIGHT_OPEN = '400px'; +var HEIGHT_FOLDED = '28px'; + return Widget.extend({ template: "mail.ChatWindow", events: { @@ -40,7 +43,9 @@ return Widget.extend({ this.thread.on('redirect_to_channel', null, this.trigger.bind(this, 'redirect_to_channel')); this.thread.on('redirect', null, this.trigger.bind(this, 'redirect')); - this.fold(); + if (this.folded) { + this.$el.css('height', HEIGHT_FOLDED); + } var def = this.thread.appendTo(this.$content); return $.when(this._super(), def); }, @@ -63,7 +68,7 @@ return Widget.extend({ fold: function () { this.update_header(); this.$el.animate({ - height: this.folded ? "28px" : "400px" + height: this.folded ? HEIGHT_FOLDED : HEIGHT_OPEN }); }, toggle_fold: function (fold) { |
