github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-24 22:51:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: selected diversity was off by one (#10659)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-09-12 09:44:45 +02:00
committed by GitHub
parent 539eb63904
commit e8053d17f6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/components/emoji-picker.js
View File

@ -150,7 +150,7 @@ export default Component.extend({
].map((name, index) => { ].map((name, index) => {
return { return {
name, name,
icon: index === this.selectedDiversity ? "check" : "", icon: index + 1 === this.selectedDiversity ? "check" : "",
}; };
}); });
}), }),
@ -162,7 +162,8 @@ export default Component.extend({
}, },
@action @action
onDiversitySelection(scale) { onDiversitySelection(index) {
const scale = index + 1;
this.emojiStore.diversity = scale; this.emojiStore.diversity = scale;
this.set("selectedDiversity", scale); this.set("selectedDiversity", scale);
@ -248,8 +249,8 @@ export default Component.extend({
_codeWithDiversity(code, selectedDiversity) { _codeWithDiversity(code, selectedDiversity) {
if (/:t\d/.test(code)) { if (/:t\d/.test(code)) {
return code; return code;
} else if (selectedDiversity !== 0 && isSkinTonableEmoji(code)) { } else if (selectedDiversity > 1 && isSkinTonableEmoji(code)) {
return `${code}:t${selectedDiversity + 1}`; return `${code}:t${selectedDiversity}`;
} else { } else {
return code; return code;
} }