[REF] mail: split emoji files to ease inheritance

Purpose is to clearly distinguish

  * common: holding common code for emojis-enabled fields;
  * text emoji field: support of emojis in text fields;
  * char emoji field: support of emojis in char fields;

Task ID-2224393
PR #49096
This commit is contained in:
Thibault Delavallée
2020-08-11 14:38:32 +00:00
parent 6b7e20da3f
commit 7a253beab2
4 changed files with 41 additions and 17 deletions
@@ -0,0 +1,18 @@
odoo.define('mail.field_char_emojis', function (require) {
"use strict";
var basicFields = require('web.basic_fields');
var registry = require('web.field_registry');
var FieldEmojiCommon = require('mail.field_emojis_common');
var MailEmojisMixin = require('mail.emoji_mixin');
/**
* Extension of the FieldChar that will add emojis support
*/
var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCommon);
registry.add('char_emojis', FieldCharEmojis);
return FieldCharEmojis;
});
@@ -1,10 +1,9 @@
odoo.define('mail.text_emojis_field', function (require) {
odoo.define('mail.field_emojis_common', function (require) {
"use strict";
var basicFields = require('web.basic_fields');
var core = require('web.core');
var emojis = require('mail.emojis');
var registry = require('web.field_registry');
var MailEmojisMixin = require('mail.emoji_mixin');
var _onEmojiClickMixin = MailEmojisMixin._onEmojiClick;
var QWeb = core.qweb;
@@ -132,19 +131,6 @@ var FieldEmojiCommon = {
}
};
/**
* Extension of the FieldText that will add emojis support
*/
var FieldTextEmojis = basicFields.FieldText.extend(MailEmojisMixin, FieldEmojiCommon);
/**
* Extension of the FieldChar that will add emojis support
*/
var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCommon);
registry.add('text_emojis', FieldTextEmojis);
registry.add('char_emojis', FieldCharEmojis);
return {FieldTextEmojis: FieldTextEmojis, FieldCharEmojis: FieldCharEmojis, FieldEmojiCommon: FieldEmojiCommon};
return FieldEmojiCommon;
});
@@ -0,0 +1,18 @@
odoo.define('mail.field_text_emojis', function (require) {
"use strict";
var basicFields = require('web.basic_fields');
var registry = require('web.field_registry');
var FieldEmojiCommon = require('mail.field_emojis_common');
var MailEmojisMixin = require('mail.emoji_mixin');
/**
* Extension of the FieldText that will add emojis support
*/
var FieldTextEmojis = basicFields.FieldText.extend(MailEmojisMixin, FieldEmojiCommon);
registry.add('text_emojis', FieldTextEmojis);
return FieldTextEmojis;
});
+3 -1
View File
@@ -38,7 +38,9 @@
<!-- Emojis -->
<script type="text/javascript" src="/mail/static/src/js/emojis.js"></script>
<script type="text/javascript" src="/mail/static/src/js/emojis_mixin.js"/>
<script type="text/javascript" src="/mail/static/src/js/text_emojis_fields.js"/>
<script type="text/javascript" src="/mail/static/src/js/field_emojis_common.js"/>
<script type="text/javascript" src="/mail/static/src/js/field_char_emojis.js"/>
<script type="text/javascript" src="/mail/static/src/js/field_text_emojis.js"/>
<link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/emojis.scss"/>
<!-- Others -->