Skip to content

Fix broken image when editing comment with non-image attachments (#32319) #32345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 2, 2024
Merged

Fix broken image when editing comment with non-image attachments (#32319) #32345

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0102ff6
Fix broken image when editing comment with non-image attachments (#32…
yp05327 Oct 23, 2024
2642daf
Fix bug
lunny Oct 30, 2024
4059a55
Merge branch 'release/v1.22' into lunny/fix-dropzone-image2
lunny Nov 1, 2024
b6a0dc1
Merge branch 'release/v1.22' into lunny/fix-dropzone-image2
lunny Nov 1, 2024
b16da8c
Merge branch 'lunny/fix-dropzone-image2' of github.com:lunny/gitea in…
lunny Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion web_src/js/features/repo-issue-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkd
import {createDropzone} from './dropzone.js';
import {GET, POST} from '../modules/fetch.js';
import {hideElem, showElem} from '../utils/dom.js';
import {isImageFile} from '../utils/image.js';
import {attachRefIssueContextPopup} from './contextpopup.js';
import {initCommentContent, initMarkupContent} from '../markup/content.js';

Expand Down Expand Up @@ -84,7 +85,9 @@ async function onEditContent(event) {
for (const attachment of data) {
const imgSrc = `${dropzone.getAttribute('data-link-url')}/${attachment.uuid}`;
dz.emit('addedfile', attachment);
dz.emit('thumbnail', attachment, imgSrc);
if (isImageFile(attachment.name)) {
dz.emit('thumbnail', attachment, imgSrc);
}
dz.emit('complete', attachment);
fileUuidDict[attachment.uuid] = {submitted: true};
dropzone.querySelector(`img[src='${imgSrc}']`).style.maxWidth = '100%';
Expand Down
4 changes: 4 additions & 0 deletions web_src/js/utils/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@ export async function imageInfo(blob) {

return {width, dppx};
}

export function isImageFile(name) {
return /\.(jpe?g|png|gif|webp|svg|heic)$/i.test(name);
}