pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REVERT]rev 9073 dle@openerp.com-20140107105324-xaa21r8fnl0ncg66, revert change in im_common js, it should not have been commited at all.

Browse Source 
bzr revid: dle@openerp.com-20140107143908-ci69xk0235m2pxzt
This commit is contained in:
Denis Ledoux
2014-01-07 15:39:08 +01:00
parent c0117351a8
commit b62aed69eb
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/im/static/src/js/im_common.js
+2 -22
View File
@@ -88,7 +88,6 @@ function declare($, _, openerp) {
this.users_cache = {};
this.last = null;
this.unload_event_handler = _.bind(this.unload, this);
this.on("new_conversation", this, this.load_history);
},
start_polling: function() {
var self = this;
@@ -253,20 +252,11 @@ function declare($, _, openerp) {
}
return def.then(function() {return conv});
},
load_history: function(conv){
var self = this;
im_common.connection.model("im.message").call("search", [[["session_id", "=", conv.session_id]], 0, 10]).then(function(message_ids){
im_common.connection.model("im.message").call("read", [message_ids]).then(function(messages){
messages.reverse();
self.received_messages(messages);
});
});
},
received_messages: function(messages) {
var self = this;
var defs = [];
var received = false;
function post_message(message) {
_.each(messages, function(message) {
if (! message.technical) {
defs.push(self.activate_session(message.session_id[0]).then(function(conv) {
received = self.my_id !== message.from_id[0];
@@ -277,15 +267,6 @@ function declare($, _, openerp) {
message.json = json;
defs.push($.when(im_common.technical_messages_handlers[json.type](self, message)));
}
}
_.each(messages, function(message){
if (defs.length > 0){
debugger;
defs[defs.length - 1].then(post_message(message));
}
else{
post_message(message);
}
});
return $.when.apply($, defs).then(function(){
if (! self.get("window_focus") && received) {
@@ -419,7 +400,7 @@ function declare($, _, openerp) {
} else {
this.set("pending", this.get("pending") + 1);
}
return this.c_manager.ensure_users([message.from_id[0]]).then(_.bind(function(users) {
this.c_manager.ensure_users([message.from_id[0]]).then(_.bind(function(users) {
var user = users[0];
if (! _.contains(this.get("users"), user) && ! _.contains(this.others, user)) {
this.others.push(user);
@@ -466,7 +447,6 @@ function declare($, _, openerp) {
return new Array(size - str.length + 1).join('0') + str;
};
date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
debugger;
var to_show = _.map(items, im_common.escape_keep_url);
this.last_bubble = $(openerp.qweb.render("im_common.conversation_bubble", {"items": to_show, "user": user, "time": date}));
$(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);