git724/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Direct SVG rendering (#12157)

Browse source 
Introduce 'make svg' which calls a node script that compiles svg files
to `public/img/svg`. These files are vendored to not create a dependency
on Node for the backend build.

On the frontend side, configure webpack using `raw-loader` so SVGs can
be imported as string.

Also moved our existing SVGs to web_src/svg for consistency.

Fixes: https://github.com/go-gitea/gitea/issues/11618
This commit is contained in:
silverwind 2020-07-12 11:10:56 +02:00 • committed by GitHub
parent 63591016b3
commit 8188176b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
227 changed files with 452 additions and 609 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web_src/js/features/contextpopup.js
View file

@ -1,4 +1,4 @@
import {svg} from '../utils.js';
import {svg} from '../svg.js';
const {AppSubUrl} = window.config;

9
web_src/js/index.js
View file

@ -3555,12 +3555,3 @@ window.onOAuthLoginClick = function () {
oauthNav.show();
}, 5000);
};
// Pull SVGs via AJAX to workaround CORS issues with <use> tags
// https://css-tricks.com/ajaxing-svg-sprite/
$.get(`${window.config.StaticUrlPrefix}/img/svg/icons.svg`, (data) => {
const div = document.createElement('div');
div.style.display = 'none';
div.innerHTML = new XMLSerializer().serializeToString(data.documentElement);
document.body.insertBefore(div, document.body.childNodes[0]);
});

2
web_src/js/markdown/anchors.js
View file

@ -1,4 +1,4 @@
import {svg} from '../utils.js';
import {svg} from '../svg.js';
const headingSelector = '.markdown h1, .markdown h2, .markdown h3, .markdown h4, .markdown h5, .markdown h6';

30
web_src/js/svg.js Normal file
View file

@ -0,0 +1,30 @@
import octiconGitMerge from '../../public/img/svg/octicon-git-merge.svg';
import octiconGitPullRequest from '../../public/img/svg/octicon-git-pull-request.svg';
import octiconIssueClosed from '../../public/img/svg/octicon-issue-closed.svg';
import octiconIssueOpened from '../../public/img/svg/octicon-issue-opened.svg';
import octiconLink from '../../public/img/svg/octicon-link.svg';
const svgs = {
'octicon-git-merge': octiconGitMerge,
'octicon-git-pull-request': octiconGitPullRequest,
'octicon-issue-closed': octiconIssueClosed,
'octicon-issue-opened': octiconIssueOpened,
'octicon-link': octiconLink,
};
const parser = new DOMParser();
const serializer = new XMLSerializer();
// retrieve a HTML string for given SVG icon name and size in pixels
export function svg(name, size = 16) {
if (name in svgs) {
if (size === 16) return svgs[name];
const document = parser.parseFromString(svgs[name], 'image/svg+xml');
const svgNode = document.firstChild;
svgNode.setAttribute('width', String(size));
svgNode.setAttribute('height', String(size));
return serializer.serializeToString(svgNode);
}
return '';
}

5
web_src/js/utils.js
View file

@ -1,8 +1,3 @@
// retrieve a HTML string for given SVG icon name and size in pixels
export function svg(name, size) {
return `<svg class="svg ${name}" width="${size}" height="${size}" aria-hidden="true"><use xlink:href="#${name}"/></svg>`;
}
// transform /path/to/file.ext to file.ext
export function basename(path = '') {
return path ? path.replace(/^.*\//, '') : '';