mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-30 14:26:04 +02:00
Fix two UI bugs: JS error in imagediff.js, 500 error in diff/compare.tmpl
Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
741c55b4ea
commit
fef26c159c
2 changed files with 12 additions and 5 deletions
|
@ -191,7 +191,7 @@
|
|||
<div class="twelve wide column issue-title">
|
||||
{{.i18n.Tr "repo.pulls.has_pull_request" (Escape $.RepoLink) (Escape $.RepoRelPath) .PullRequest.Index | Safe}}
|
||||
<h1>
|
||||
<span id="issue-title">{{RenderIssueTitle .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas}}</span>
|
||||
<span id="issue-title">{{RenderIssueTitle $.Context .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas}}</span>
|
||||
<span class="index">#{{.PullRequest.Issue.Index}}</span>
|
||||
</h1>
|
||||
</div>
|
||||
|
|
|
@ -4,10 +4,12 @@ function getDefaultSvgBoundsIfUndefined(svgXml, src) {
|
|||
const DefaultSize = 300;
|
||||
const MaxSize = 99999;
|
||||
|
||||
const svg = svgXml.rootElement;
|
||||
|
||||
const width = svg.width.baseVal;
|
||||
const height = svg.height.baseVal;
|
||||
const svg = svgXml.documentElement;
|
||||
const width = svg?.width?.baseVal;
|
||||
const height = svg?.height?.baseVal;
|
||||
if (width === undefined || height === undefined) {
|
||||
return null; // in case some svg is invalid or doesn't have the width/height
|
||||
}
|
||||
if (width.unitType === SVGLength.SVG_LENGTHTYPE_PERCENTAGE || height.unitType === SVGLength.SVG_LENGTHTYPE_PERCENTAGE) {
|
||||
const img = new Image();
|
||||
img.src = src;
|
||||
|
@ -29,6 +31,7 @@ function getDefaultSvgBoundsIfUndefined(svgXml, src) {
|
|||
height: DefaultSize
|
||||
};
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export default function initImageDiff() {
|
||||
|
@ -88,6 +91,10 @@ export default function initImageDiff() {
|
|||
info.$image.on('load', () => {
|
||||
info.loaded = true;
|
||||
setReadyIfLoaded();
|
||||
}).on('error', () => {
|
||||
info.loaded = true;
|
||||
setReadyIfLoaded();
|
||||
info.$boundsInfo.text('(image error)');
|
||||
});
|
||||
info.$image.attr('src', info.path);
|
||||
|
||||
|
|
Loading…
Reference in a new issue