diff options
| author | Sébastien Theys <seb@odoo.com> | 2020-09-28 16:26:20 +0000 |
|---|---|---|
| committer | Sébastien Theys <seb@odoo.com> | 2020-09-29 12:54:33 +0000 |
| commit | 07ef748c542cb20fdab4f0d9c02a87fb07bede3c (patch) | |
| tree | f22129a68e808ed290dde3ced9014cba0686c233 /addons/mail/static/src/components | |
| parent | 53468d71b913211b38f4856f2bdb62594ee24ea8 (diff) | |
[FIX] mail: fix tour to allow public or private channel selection
task-2313321
closes odoo/odoo#58778
X-original-commit: f6a561a7e21772c6a25785c8b2428954d4bd152e
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons/mail/static/src/components')
4 files changed, 13 insertions, 6 deletions
diff --git a/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js b/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js index 1e383f7b307..e9bb5286ee2 100644 --- a/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js +++ b/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js @@ -89,7 +89,6 @@ class AutocompleteInput extends Component { * @param {Object} ui */ _onAutocompleteSelect(ev, ui) { - ev.stopPropagation(); if (this.props.select) { this.props.select(ev, ui); } diff --git a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js index 11737fa04dc..d5eaf72618d 100644 --- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js +++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js @@ -55,6 +55,13 @@ class DiscussSidebar extends Component { } /** + * @returns {string} + */ + get FIND_OR_CREATE_CHANNEL() { + return this.env._t("Find or create a channel..."); + } + + /** * @returns {mail.thread[]} */ get orderedMailboxes() { diff --git a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml index ac4ac02bd46..4f9c10e5de2 100644 --- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml +++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml @@ -28,9 +28,10 @@ <div class="o_DiscussSidebar_item o_DiscussSidebar_itemNew"> <AutocompleteInput class="o_DiscussSidebar_itemNewInput" + customClass="'o_DiscussSidebar_newChannelAutocompleteSuggestions'" isFocusOnMount="true" isHtml="true" - placeholder="'Find or create a channel...'" + placeholder="FIND_OR_CREATE_CHANNEL" select="_onAddChannelAutocompleteSelect" source="_onAddChannelAutocompleteSource" t-on-o-hide="_onHideAddingItem" diff --git a/addons/mail/static/src/components/message/message.scss b/addons/mail/static/src/components/message/message.scss index b91aacba91c..bb2fea6e47d 100644 --- a/addons/mail/static/src/components/message/message.scss +++ b/addons/mail/static/src/components/message/message.scss @@ -42,11 +42,11 @@ } .o_Message_content { - flex: 1 1 auto; - min-width: 0; - max-width: 100%; word-wrap: break-word; word-break: break-word; + // Message content can contain arbitrary HTML that might overflow and break + // the style without this rule. + overflow: auto; > p:last-of-type { margin-bottom: 0; @@ -54,8 +54,8 @@ } .o_Message_core { + min-width: 0; // allows this flex child to shrink more than its content margin-inline-end: map-get($spacers, 3); - overflow: auto; } .o_Message_footer { |