From 8188176b588264fe0ff8e3f82a623ea007a1af41 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 12 Jul 2020 11:10:56 +0200
Subject: Direct SVG rendering (#12157)

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
---
 web_src/js/features/contextpopup.js |  2 +-
 web_src/js/index.js                 |  9 ---------
 web_src/js/markdown/anchors.js      |  2 +-
 web_src/js/svg.js                   | 30 ++++++++++++++++++++++++++++++
 web_src/js/utils.js                 |  5 -----
 5 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 web_src/js/svg.js

(limited to 'web_src/js')

diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js
index 377a6a8f5a..2597c18014 100644
--- a/web_src/js/features/contextpopup.js
+++ b/web_src/js/features/contextpopup.js
@@ -1,4 +1,4 @@
-import {svg} from '../utils.js';
+import {svg} from '../svg.js';
 
 const {AppSubUrl} = window.config;
 
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 15ca32cfdc..8064e59507 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -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]);
-});
diff --git a/web_src/js/markdown/anchors.js b/web_src/js/markdown/anchors.js
index 766fa34a7a..73c38eef32 100644
--- a/web_src/js/markdown/anchors.js
+++ b/web_src/js/markdown/anchors.js
@@ -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';
 
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
new file mode 100644
index 0000000000..5e66a4dd1a
--- /dev/null
+++ b/web_src/js/svg.js
@@ -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 '';
+}
diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index b16b05a1b7..229f4d6304 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -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(/^.*\//, '') : '';
-- 
cgit v1.2.3