diff options
| author | Jérome Maes <jem@openerp.com> | 2014-09-02 16:19:50 +0200 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2014-09-02 18:52:27 +0200 |
| commit | 7ca76c8ed7232dffe37e660437eb8da7bec36617 (patch) | |
| tree | 895142cb7d01e781d2ab07e02c1a34f0366e9cb2 /addons/im_chat | |
| parent | e95aeb659cfe17a2e11e21a3ed691e6956abeedd (diff) | |
[FIX] im_chat : scroll down on opening conversation and add scroll bar on user list
Diffstat (limited to 'addons/im_chat')
| -rw-r--r-- | addons/im_chat/static/src/css/im_chat.css | 2 | ||||
| -rw-r--r-- | addons/im_chat/static/src/js/im_chat.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/im_chat/static/src/css/im_chat.css b/addons/im_chat/static/src/css/im_chat.css index ea350377dba..d25597a7b67 100644 --- a/addons/im_chat/static/src/css/im_chat.css +++ b/addons/im_chat/static/src/css/im_chat.css @@ -64,6 +64,8 @@ .oe_im_users { padding-bottom: 38px; + height: 100%; + overflow-y: scroll; } .oe_im_user { position: relative; diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js index a6156f8f43c..d06ee9f09f9 100644 --- a/addons/im_chat/static/src/js/im_chat.js +++ b/addons/im_chat/static/src/js/im_chat.js @@ -267,7 +267,6 @@ this.set("pending", this.get("pending") + 1); } this.insert_messages([message]); - this._go_bottom(); }, send_message: function(message, type) { var self = this; @@ -325,6 +324,7 @@ }); // render and set the content of the chatview this.$('.oe_im_chatview_content_bubbles').html($(openerp.qweb.render("im_chat.Conversation_content", {"list": res}))); + this._go_bottom(); }, keydown: function(e) { if(e && e.which !== 13) { |