IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: makes smile the default emoji-picker icon (#30843)

Browse Source 
discourse-emojis is used in chat only for message actions to show a
difference with the the other emojis so people don't think it's just the
smiley emoji.
This commit is contained in:
Joffrey JAFFEUX
2025-01-17 12:29:18 +01:00
committed by GitHub
parent 359bbbe617
commit f8d5a7873a
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/components/emoji-picker/index.gjs
View File

@@ -14,7 +14,7 @@ export default class EmojiPicker extends Component {
} }
get icon() { get icon() {
return this.args.icon ?? "discourse-emojis"; return this.args.icon ?? "face-smile";
} }
get context() { get context() {
@@ -38,10 +38,10 @@ export default class EmojiPicker extends Component {
@onClose={{@onClose}} @onClose={{@onClose}}
> >
<:trigger> <:trigger>
{{#if @icon}} {{#if @emoji}}
{{replaceEmoji (concat ":" @icon ":")}} {{replaceEmoji (concat ":" @emoji ":")}}
{{else}} {{else}}
{{icon "discourse-emojis"}} {{icon this.icon}}
{{/if}} {{/if}}
{{#if @label}} {{#if @label}}

2
app/assets/javascripts/discourse/app/components/user-status-picker.gjs
View File

@@ -46,7 +46,7 @@ export default class UserStatusPicker extends Component {
}} }}
> >
<EmojiPicker <EmojiPicker
@icon={{@status.emoji}} @emoji={{@status.emoji}}
@didSelectEmoji={{this.emojiSelected}} @didSelectEmoji={{this.emojiSelected}}
@btnClass="btn-emoji" @btnClass="btn-emoji"
@modalForMobile={{false}} @modalForMobile={{false}}

2
app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
View File

@@ -16,7 +16,7 @@ export default {
toolbar.addButton({ toolbar.addButton({
id: "emoji", id: "emoji",
group: "extras", group: "extras",
icon: "discourse-emojis", icon: "face-smile",
sendAction: () => { sendAction: () => {
const menu = api.container.lookup("service:menu"); const menu = api.container.lookup("service:menu");
menu.show(document.querySelector(".insert-composer-emoji"), { menu.show(document.querySelector(".insert-composer-emoji"), {

4
app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
View File

@@ -112,7 +112,7 @@ acceptance("User Status", function (needs) {
await visit("/"); await visit("/");
await openUserStatusModal(); await openUserStatusModal();
assert.dom(".d-icon-discourse-emojis").exists("empty status icon is shown"); assert.dom(".d-icon-face-smile").exists("empty status icon is shown");
await pickEmoji(userStatusEmoji); await pickEmoji(userStatusEmoji);
@@ -305,7 +305,7 @@ acceptance("User Status", function (needs) {
await click(".btn.delete-status"); await click(".btn.delete-status");
await openUserStatusModal(); await openUserStatusModal();
assert.dom(".d-icon-discourse-emojis").exists("empty status icon is shown"); assert.dom(".d-icon-face-smile").exists("empty status icon is shown");
assert assert
.dom(".user-status-description") .dom(".user-status-description")
.hasValue("", "no status description is shown"); .hasValue("", "no status description is shown");

2
plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
View File

@@ -64,7 +64,7 @@ class ChatSetupInit {
label: "chat.emoji", label: "chat.emoji",
id: "emoji", id: "emoji",
class: "chat-emoji-btn", class: "chat-emoji-btn",
icon: "discourse-emojis", icon: "smile",
position: "dropdown", position: "dropdown",
displayed: owner.lookup("service:site").mobileView, displayed: owner.lookup("service:site").mobileView,
action(context) { action(context) {