[FIX] mail: clean emoji_picker modeling
This commit cleans up a bit of the emoji picker modeling, and removes a bit of dead code Task-2985893 closes odoo/odoo#103411 Related: odoo/enterprise#33128 Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
This commit is contained in:
@@ -15,9 +15,6 @@ registerModel({
|
||||
allEmojis: many('Emoji', {
|
||||
inverse: 'emojiCategories',
|
||||
}),
|
||||
emojiCount: attr({ //Number of emojis that will be in that category once every emoji is loaded.
|
||||
default: 0,
|
||||
}),
|
||||
emojiRegistry: one("EmojiRegistry", {
|
||||
compute() {
|
||||
return this.messaging.emojiRegistry;
|
||||
|
||||
@@ -19,13 +19,11 @@ registerModel({
|
||||
},
|
||||
async _populateFromEmojiData(dataCategories, dataEmojis) {
|
||||
dataCategories.map(category => {
|
||||
const emojiCount = dataEmojis.reduce((acc, emoji) => emoji.category === category.name ? acc + 1 : acc, 0);
|
||||
this.update({
|
||||
dataCategories: insert({
|
||||
name: category.name,
|
||||
title: category.title,
|
||||
sortId: category.sortId,
|
||||
emojiCount,
|
||||
}),
|
||||
});
|
||||
});
|
||||
|
||||
@@ -14,12 +14,12 @@ registerModel({
|
||||
if (!this.emojiGridItemViewOwner.emojiGridRowViewOwner) {
|
||||
return;
|
||||
}
|
||||
if (this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction) {
|
||||
this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction.onClickReaction(ev);
|
||||
if (this.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction) {
|
||||
this.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction.onClickReaction(ev);
|
||||
return;
|
||||
}
|
||||
if (this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji) {
|
||||
this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji.onClickEmoji(ev);
|
||||
if (this.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji) {
|
||||
this.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji.onClickEmoji(ev);
|
||||
return;
|
||||
}
|
||||
},
|
||||
@@ -54,5 +54,10 @@ registerModel({
|
||||
emojiGridViewAsHovered: one('EmojiGridView', {
|
||||
inverse: 'hoveredEmojiView',
|
||||
}),
|
||||
emojiPickerViewOwner: one('EmojiPickerView', {
|
||||
compute() {
|
||||
return this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner;
|
||||
}
|
||||
})
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user