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

[FIX] mail: prevent double scrollbar with notification bar

Browse Source 
when the bar asking for notification permission appears, it can cause
two scrollbars to appear in the client action.  This commit moves the
notification bar inside the chat content, which solves the issue.
This commit is contained in:
Géry Debongnie
2016-01-11 11:00:18 +01:00
parent b38cd437e4
commit cf294f723f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/client_action.js
+1 -1
View File
@@ -210,7 +210,7 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
this.extended_composer.on('post_message', this, this.on_post_message);
this.extended_composer.on('input_focused', this, this.on_composer_input_focused);
var def1 = this.thread.prependTo(this.$('.o_mail_chat_content'));
var def1 = this.thread.appendTo(this.$('.o_mail_chat_content'));
var def2 = this.basic_composer.appendTo(this.$('.o_mail_chat_content'));
var def3 = this.extended_composer.appendTo(this.$('.o_mail_chat_content'));
var def4 = this.searchview.appendTo($("<div>"));
addons/mail/static/src/xml/client_action.xml
+8 -7
View File
@@ -4,14 +4,15 @@
<!-- Client Action -->
<t t-name="mail.client_action">
<div class="o_mail_chat">
<t t-if="widget.notification_bar">
<div class="o_mail_annoying_notification_bar">
<span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span>
<span class="fa fa-close"></span>
</div>
</t>
<div class="o_mail_chat_sidebar"/>
<div class="o_mail_chat_content"/>
<div class="o_mail_chat_content">
<t t-if="widget.notification_bar">
<div class="o_mail_annoying_notification_bar">
<span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span>
<span class="fa fa-close"></span>
</div>
</t>
</div>
</div>
</t>
<t t-name="mail.chat.Sidebar">