grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Dessalines 2020-01-24 21:54:26 -05:00
commit 691d05222b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/src/components/comment-form.tsx vendored
View file

@ -225,13 +225,15 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
.then(res => res.json()) .then(res => res.json())
.then(res => { .then(res => {
let url = `${window.location.origin}/pictshare/${res.url}`; let url = `${window.location.origin}/pictshare/${res.url}`;
let markdown = let imageMarkdown =
res.filetype == 'mp4' ? `[vid](${url}/raw)` : `![](${url})`; res.filetype == 'mp4' ? `[vid](${url}/raw)` : `![](${url})`;
let content = i.state.commentForm.content; let content = i.state.commentForm.content;
content = content ? `${content} ${markdown}` : markdown; content = content ? `${content}\n${imageMarkdown}` : imageMarkdown;
i.state.commentForm.content = content; i.state.commentForm.content = content;
i.state.imageLoading = false; i.state.imageLoading = false;
i.setState(i.state); i.setState(i.state);
var textarea: any = document.getElementById(i.id);
autosize.update(textarea);
}) })
.catch(error => { .catch(error => {
i.state.imageLoading = false; i.state.imageLoading = false;

2
ui/src/utils.ts vendored
View file

@ -382,6 +382,8 @@ export function toast(text: string, background: string = 'success') {
Toastify({ Toastify({
text: text, text: text,
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
gravity: 'bottom',
position: 'left',
}).showToast(); }).showToast();
} }