diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-10-19 15:43:57 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2015-10-22 14:43:13 +0200 |
| commit | cfc18172a53ec550299aa9902cc226050f75bc6f (patch) | |
| tree | 16d64682d07a18e599672f195a52d6e01a7e2ed9 /addons/mail/static/src/xml | |
| parent | 4d54a8c0ffb84ebc2744f3bf4e82f9dcd6a96912 (diff) | |
[IMP] mail: composer: use textarea in client action
... allowing multi-line edition, like in the chatter.
Shortcuts:
- in the client action: ENTER sends, SHIFT+ENTER goes to newline
- in the chatter: SHIFT+ENTER sends, ENTER goes to newline
Don't use autosize anymore to resize the textarea according to its content as
it didn't fit well within the flex layout of the client action ('height: auto'
didn't increase the height of the flex-item with 'flex-grow: 0'). We perform
the resizing ourselves instead.
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/chatter.xml | 5 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/addons/mail/static/src/xml/chatter.xml b/addons/mail/static/src/xml/chatter.xml index 72a1c7aaeae..17f4c51749f 100644 --- a/addons/mail/static/src/xml/chatter.xml +++ b/addons/mail/static/src/xml/chatter.xml @@ -52,11 +52,6 @@ </t> </t> - <!-- Replace the input by a textarea --> - <t t-jquery=".o_composer_input" t-operation="replace"> - <textarea class="o_composer_input" placeholder="Write something"/> - </t> - <!-- Add a button to open the full composer dialog --> <t t-jquery=".o_composer_buttons" t-operation="append"> <button class="btn btn-sm btn-icon fa fa-pencil-square-o o_composer_button_full_composer" type="button"/> diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 39e0b5afdc2..4d37474ba32 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -4,7 +4,7 @@ <div t-name="mail.ChatComposer" class="o_chat_composer"> <div class="o_composer"> <div class="dropup o_composer_mention_dropdown"/> - <input type="text" class="o_composer_input" placeholder="Write something"/> + <textarea class="o_composer_input" placeholder="Write something"/> <div class="btn-group o_composer_buttons"> <button class="btn btn-sm btn-primary o_composer_button_send" type="button">Send</button> <button class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> |