github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 15:14:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Change dIcon to icon in components (#31083)

Browse Source 
Apparently `icon` is the preferred nomenclature
This commit is contained in:
Martin Brennan
2025-01-31 10:55:31 +10:00
committed by GitHub
parent dfb64f9b84
commit 7fd9550f64
31 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs
View File

@ -7,7 +7,7 @@ import { and, not, or } from "truth-helpers";
import DButton from "discourse/components/d-button";
import PluginOutlet from "discourse/components/plugin-outlet";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { i18n } from "discourse-i18n";
import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
import EmptyChannelsList from "discourse/plugins/chat/discourse/components/empty-channels-list";
@ -81,7 +81,7 @@ export default class ChannelsListDirect extends Component {
}}
data-toggleable="direct-message-channels"
>
{{dIcon "angle-up"}}
{{icon "angle-up"}}
</span>
{{/if}}

8
plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
View File

@ -7,7 +7,7 @@ import { service } from "@ember/service";
import { and } from "truth-helpers";
import PluginOutlet from "discourse/components/plugin-outlet";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { i18n } from "discourse-i18n";
import EmptyChannelsList from "discourse/plugins/chat/discourse/components/empty-channels-list";
import ChatChannelRow from "./chat-channel-row";
@ -51,7 +51,7 @@ export default class ChannelsListPublic extends Component {
{{#if (and this.site.desktopView this.inSidebar this.hasThreadedChannels)}}
<LinkTo @route="chat.threads" class="chat-channel-row --threads">
<span class="chat-channel-title">
{{dIcon "discourse-threads" class="chat-user-threads__icon"}}
{{icon "discourse-threads" class="chat-user-threads__icon"}}
{{i18n "chat.my_threads.title"}}
</span>
{{#if this.hasUnreadThreads}}
@ -75,7 +75,7 @@ export default class ChannelsListPublic extends Component {
{{on "click" (fn this.toggleChannelSection "public-channels")}}
data-toggleable="public-channels"
>
{{dIcon "angle-up"}}
{{icon "angle-up"}}
</span>
{{/if}}
@ -86,7 +86,7 @@ export default class ChannelsListPublic extends Component {
class="btn no-text btn-flat open-browse-page-btn title-action"
title={{i18n "chat.channels_list_popup.browse"}}
>
{{dIcon "pencil"}}
{{icon "pencil"}}
</LinkTo>
</div>
{{/if}}

6
plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs
View File

@ -5,7 +5,7 @@ import { service } from "@ember/service";
import { gt } from "truth-helpers";
import borderColor from "discourse/helpers/border-color";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import replaceEmoji from "discourse/helpers/replace-emoji";
import { i18n } from "discourse-i18n";
import ToggleChannelMembershipButton from "./toggle-channel-membership-button";
@ -34,14 +34,14 @@ export default class ChatChannelCard extends Component {
{{replaceEmoji @channel.title}}
</span>
{{#if @channel.chatable.read_restricted}}
{{dIcon "lock" class="chat-channel-card__read-restricted"}}
{{icon "lock" class="chat-channel-card__read-restricted"}}
{{/if}}
{{#if @channel.currentUserMembership.muted}}
<span
class="chat-channel-card__muted"
aria-label={{i18n "chat.muted"}}
title={{i18n "chat.muted"}}
>{{dIcon "d-muted"}}</span>
>{{icon "d-muted"}}</span>
{{/if}}
</LinkTo>

4
plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs
View File

@ -1,5 +1,5 @@
import Component from "@glimmer/component";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { i18n } from "discourse-i18n";
import {
CHANNEL_STATUSES,
@ -66,7 +66,7 @@ export default class ChatChannelStatus extends Component {
<template>
{{#if this.shouldRender}}
<div class="chat-channel-status">
{{dIcon this.channelStatusIcon}}
{{icon this.channelStatusIcon}}
<span>{{this.channelStatusMessage}}</span>
<ChatChannelArchiveStatus @channel={{@channel}} />
</div>

4
plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
View File

@ -1,6 +1,6 @@
import { htmlSafe } from "@ember/template";
import DButton from "discourse/components/d-button";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import replaceEmoji from "discourse/helpers/replace-emoji";
import ChatUserAvatar from "./chat-user-avatar";
@ -11,7 +11,7 @@ const ChatComposerMessageDetails = <template>
data-action={{if @message.editing "edit" "reply"}}
>
<div class="chat-reply">
{{dIcon (if @message.editing "pencil" "reply")}}
{{icon (if @message.editing "pencil" "reply")}}
<ChatUserAvatar @user={{@message.user}} />
<span class="chat-reply__username">{{@message.user.username}}</span>
<span class="chat-reply__excerpt">

6
plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
View File

@ -1,7 +1,7 @@
import Component from "@glimmer/component";
import DButton from "discourse/components/d-button";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { isImage } from "discourse/lib/uploads";
import { i18n } from "discourse-i18n";
@ -32,10 +32,10 @@ export default class ChatComposerUpload extends Component {
{{#if @isDone}}
<img class="preview-img" src={{@upload.short_path}} />
{{else}}
{{dIcon "far-image"}}
{{icon "far-image"}}
{{/if}}
{{else}}
{{dIcon "file-lines"}}
{{icon "file-lines"}}
{{/if}}
</div>

4
plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
View File

@ -1,7 +1,7 @@
import Component from "@glimmer/component";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import getURL from "discourse/lib/get-url";
import I18n, { i18n } from "discourse-i18n";
@ -151,7 +151,7 @@ export default class ChatMentionWarnings extends Component {
{{#if this.show}}
<div class="chat-mention-warnings">
<div class="chat-mention-warning__icon">
{{dIcon "triangle-exclamation"}}
{{icon "triangle-exclamation"}}
</div>
<div class="chat-mention-warning__text">
<div class="chat-mention-warning__header">

4
plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs
View File

@ -2,7 +2,7 @@ import Component from "@glimmer/component";
import { LinkTo } from "@ember/routing";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import replaceEmoji from "discourse/helpers/replace-emoji";
import ChatEmojiAvatar from "./chat-emoji-avatar";
import ChatUserAvatar from "./chat-user-avatar";
@ -46,7 +46,7 @@ export default class ChatMessageInReplyToIndicator extends Component {
@models={{this.model}}
class="chat-reply is-direct-reply"
>
{{dIcon "share" title="chat.in_reply_to"}}
{{icon "share" title="chat.in_reply_to"}}
{{#if @message.inReplyTo.chatWebhookEvent.emoji}}
<ChatEmojiAvatar

4
plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs
View File

@ -1,9 +1,9 @@
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
const ChatComposerButton = <template>
<div class="chat-composer-button__wrapper">
<button type="button" class="chat-composer-button" ...attributes>
{{dIcon @icon}}
{{icon @icon}}
</button>
</div>
</template>;

6
plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
View File

@ -8,7 +8,7 @@ import { and } from "truth-helpers";
import BookmarkIcon from "discourse/components/bookmark-icon";
import UserStatusMessage from "discourse/components/user-status-message";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { bind } from "discourse/lib/decorators";
import { prioritizeNameInUx } from "discourse/lib/settings";
import { i18n } from "discourse-i18n";
@ -156,10 +156,10 @@ export default class ChatMessageInfo extends Component {
<span class="chat-message-info__flag">
{{#if @message.reviewableId}}
<LinkTo @route="review.show" @model={{@message.reviewableId}}>
{{dIcon "flag" title="chat.flagged"}}
{{icon "flag" title="chat.flagged"}}
</LinkTo>
{{else}}
{{dIcon "flag" title="chat.you_flagged"}}
{{icon "flag" title="chat.you_flagged"}}
{{/if}}
</span>
{{/if}}

6
plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs
View File

@ -4,7 +4,7 @@ import { LinkTo } from "@ember/routing";
import { service } from "@ember/service";
import { eq } from "truth-helpers";
import BookmarkIcon from "discourse/components/bookmark-icon";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import formatChatDate from "../../../helpers/format-chat-date";
export default class ChatMessageLeftGutter extends Component {
@ -18,11 +18,11 @@ export default class ChatMessageLeftGutter extends Component {
@model={{@message.reviewableId}}
class="chat-message-left-gutter__flag"
>
{{dIcon "flag" title="chat.flagged"}}
{{icon "flag" title="chat.flagged"}}
</LinkTo>
{{else if (eq @message.userFlagStatus 0)}}
<div class="chat-message-left-gutter__flag">
{{dIcon "flag" title="chat.you_flagged"}}
{{icon "flag" title="chat.you_flagged"}}
</div>
{{else if this.site.desktopView}}
<span class="chat-message-left-gutter__date">

4
plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs
View File

@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { i18n } from "discourse-i18n";
import laterFn from "../../../modifiers/chat/later-fn";
@ -40,7 +40,7 @@ export default class MentionWithoutMembership extends Component {
class="mention-without-membership-notice__invitation-sent"
{{laterFn @clearNotice 3000}}
>
{{dIcon "check"}}
{{icon "check"}}
<span>
{{i18n
"chat.mention_warning.invitations_sent"

4
plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs
View File

@ -1,6 +1,6 @@
import DButton from "discourse/components/d-button";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
const ScrollToBottomArrow = <template>
<div class="chat-scroll-to-bottom">
@ -13,7 +13,7 @@ const ScrollToBottomArrow = <template>
@action={{@onScrollToBottom}}
>
<span class="chat-scroll-to-bottom__arrow">
{{dIcon "arrow-down"}}
{{icon "arrow-down"}}
</span>
</DButton>
</div>

4
plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs
View File

@ -1,6 +1,6 @@
import Component from "@glimmer/component";
import { LinkTo } from "@ember/routing";
import dIcon from "discourse/helpers/d-icon";
import icon from "discourse/helpers/d-icon";
import { i18n } from "discourse-i18n";
export default class ChatPreferences extends Component {
@ -11,7 +11,7 @@ export default class ChatPreferences extends Component {
<template>
<li class="user-nav__preferences-chat">
<LinkTo @route="preferences.chat">
{{dIcon "d-chat"}}
{{icon "d-chat"}}
<span>{{i18n "chat.title_capitalized"}}</span>
</LinkTo>
</li>