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

[IMP] mail: openchatter, reduce DOM item 

bzr revid: chm@openerp.com-20121029112254-e0az3mi3vmmk83ca
This commit is contained in:
Christophe Matthieu 2012-10-29 12:22:54 +01:00
parent d97ffd7b19
commit 81df392b71
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/mail/static/src/js/mail.js
View File

@ -611,7 +611,9 @@ openerp.mail = function (session) {
this.$el.hide().fadeIn(750, function () {$(this).css('display', '');});
this.resize_img();
this.bind_events();
this.create_thread();
if(this.thread_level < this.options.display_indented_thread) {
this.create_thread();
}
this.$('.oe_msg_attachments, .oe_msg_images').addClass("oe_hidden");
},
@ -915,11 +917,6 @@ openerp.mail = function (session) {
start: function () {
this._super.apply(this, arguments);
if (this.show_compose_message) {
this.instantiate_compose_message();
}
this.bind_events();
},
@ -1195,11 +1192,10 @@ openerp.mail = function (session) {
var sort = (!!self.thread_level || message.id<0);
if (sort) {
if (message_older) {
message.insertAfter(message_older.thread.compose_message ? message_older.thread.compose_message.$el : message_older.thread.$el);
message.insertAfter(message_older.thread ? (message_older.thread.compose_message ? message_older.thread.compose_message.$el : message_older.thread.$el) : message_older.$el);
} else if (message_newer) {
@ -1220,7 +1216,7 @@ openerp.mail = function (session) {
} else if (message_newer) {
message.insertAfter(message_newer.thread.compose_message ? message_newer.thread.compose_message.$el : message_newer.thread.$el);
message.insertAfter(message_newer.thread ? (message_newer.thread.compose_message ? message_newer.thread.compose_message.$el : message_newer.thread.$el) : message_newer.$el );
} else if (message.id < 0) {

2
addons/mail/static/src/xml/mail.xml
View File

@ -40,7 +40,7 @@
<div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
<textarea class="field_text oe_compact" placeholder="Write a reply..."/>
</div>
<span t-if="!widget.show_compact_message and !widget.show_composer" class="oe_placeholder_self"></span>
<span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
</t>
<!--