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

[FIX] mail: auto-focus for composer 

bzr revid: chm@openerp.com-20121122090201-gbpr2f9bmad6aw0k
This commit is contained in:
Christophe Matthieu 2012-11-22 10:02:01 +01:00
parent dddb611df9
commit 5d4b582467
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,11 +590,11 @@ openerp.mail = function (session) {
*/
on_compose_expandable: function (event) {
if (!this.stay_open && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
if ((!this.stay_open || event.type == 'click') && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
this.show_composer = !this.show_composer || this.stay_open;
this.reinit();
}
if (!this.stay_open && this.show_composer) {
if (!this.stay_open && this.show_composer && event.type != 'blur') {
this.$('textarea:not(.oe_compact):first').focus();
}
return true;
@ -724,7 +724,7 @@ openerp.mail = function (session) {
on_message_reply:function (event) {
event.stopPropagation();
this.create_thread();
this.thread.on_compose_message();
this.thread.on_compose_message(event);
return false;
},
@ -1135,9 +1135,9 @@ openerp.mail = function (session) {
* Call the on_compose_expandable method to allow the user to write his message.
* (Is call when a user click on "Reply" button)
*/
on_compose_message: function () {
on_compose_message: function (event) {
this.instantiate_compose_message();
this.compose_message.on_compose_expandable();
this.compose_message.on_compose_expandable(event);
return false;
},