Browse Source

Fix two UI bugs: JS error in imagediff.js, 500 error in diff/compare.tmpl

Co-authored-by: 6543 <6543@obermui.de>
tags/v1.18.0-dev
wxiaoguang 2 years ago
parent
commit
fef26c159c
No account linked to committer's email address
2 changed files with 12 additions and 5 deletions
  1. 1
    1
      templates/repo/diff/compare.tmpl
  2. 11
    4
      web_src/js/features/imagediff.js

+ 1
- 1
templates/repo/diff/compare.tmpl View File

@@ -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>

+ 11
- 4
web_src/js/features/imagediff.js View File

@@ -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…
Cancel
Save