Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into fix/vote-button-no-spinners-1761

Browse source
This commit is contained in:
Jay Sitter 2023-07-02 17:36:52 -04:00 committed by GitHub
commit 23ee563dfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shared/components/common/markdown-textarea.tsx
View file

@ -702,18 +702,20 @@ export class MarkdownTextArea extends Component<
quoteInsert() { quoteInsert() {
const textarea: any = document.getElementById(this.id); const textarea: any = document.getElementById(this.id);
const selectedText = window.getSelection()?.toString(); const selectedText = window.getSelection()?.toString();
const { content } = this.state; let { content } = this.state;
if (selectedText) { if (selectedText) {
const quotedText = const quotedText =
selectedText selectedText
.split("\n") .split("\n")
.map(t => `> ${t}`) .map(t => `> ${t}`)
.join("\n") + "\n\n"; .join("\n") + "\n\n";
if (!content) { if (!content) {
this.setState({ content: "" }); content = "";
} else { } else {
this.setState({ content: `${content}\n` }); content = `${content}\n\n`;
} }
this.setState({ this.setState({
content: `${content}${quotedText}`, content: `${content}${quotedText}`,
}); });

2
src/shared/components/community/sidebar.tsx
View file

@ -258,7 +258,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
<Spinner /> <Spinner />
) : ( ) : (
<> <>
<Icon icon="check" classes="icon-inline text-success me-1" /> <Icon icon="check" classes="icon-inline me-1" />
{I18NextService.i18n.t("joined")} {I18NextService.i18n.t("joined")}
</> </>
)} )}