mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-12-24 10:07:29 +00:00
Merge branch 'main' into fix/vote-button-no-spinners-1761
This commit is contained in:
commit
23ee563dfb
|
@ -702,18 +702,20 @@ export class MarkdownTextArea extends Component<
|
|||
quoteInsert() {
|
||||
const textarea: any = document.getElementById(this.id);
|
||||
const selectedText = window.getSelection()?.toString();
|
||||
const { content } = this.state;
|
||||
let { content } = this.state;
|
||||
if (selectedText) {
|
||||
const quotedText =
|
||||
selectedText
|
||||
.split("\n")
|
||||
.map(t => `> ${t}`)
|
||||
.join("\n") + "\n\n";
|
||||
|
||||
if (!content) {
|
||||
this.setState({ content: "" });
|
||||
content = "";
|
||||
} else {
|
||||
this.setState({ content: `${content}\n` });
|
||||
content = `${content}\n\n`;
|
||||
}
|
||||
|
||||
this.setState({
|
||||
content: `${content}${quotedText}`,
|
||||
});
|
||||
|
|
|
@ -258,7 +258,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
|
|||
<Spinner />
|
||||
) : (
|
||||
<>
|
||||
<Icon icon="check" classes="icon-inline text-success me-1" />
|
||||
<Icon icon="check" classes="icon-inline me-1" />
|
||||
{I18NextService.i18n.t("joined")}
|
||||
</>
|
||||
)}
|
||||
|
|
Loading…
Reference in a new issue