odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Added multi bubble 

bzr revid: nicolas.vanhoren@openerp.com-20121130170243-0isooew0e5g01tz0
This commit is contained in:
niv-openerp 2012-11-30 18:02:43 +01:00
parent 68055413aa
commit e50b0249b6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/web_im/static/src/js/im.js
View File

@ -285,7 +285,7 @@ openerp.web_im = function(instance) {
this.$el.css("right", this.get("right_position"));
},
received_message: function(message) {
this._add_bubble(this.user, [message.message], message.date);
this._add_bubble(this.user, message.message, message.date);
},
send_message: function(e) {
if(e && e.which !== 13) {
@ -293,15 +293,22 @@ openerp.web_im = function(instance) {
}
var mes = this.$("input").val();
this.$("input").val("");
this._add_bubble(this.me, [mes], instance.web.datetime_to_str(new Date()));
this._add_bubble(this.me, mes, instance.web.datetime_to_str(new Date()));
var model = new instance.web.Model("im.message");
model.call("post", [mes, this.user.get('id')], {context: new instance.web.CompoundContext()});
},
_add_bubble: function(user, items, date) {
_add_bubble: function(user, item, date) {
var items = [item];
if (user === this.last_user) {
this.last_bubble.remove();
items = this.last_items.concat(items);
}
this.last_user = user;
this.last_items = items;
date = instance.web.str_to_datetime(date);
date = date.toString(Date.CultureInfo.formatPatterns.shortDate + " " + Date.CultureInfo.formatPatterns.shortTime);
var bubble = QWeb.render("Conversation.bubble", {"items": items, "user": user, "time": date});
$(this.$(".oe_im_chatview_content").children()[0]).append($(bubble));
this.last_bubble = $(QWeb.render("Conversation.bubble", {"items": items, "user": user, "time": date}));
$(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
},
destroy: function() {