Add markdown support in changelog

KOWX712 · Jan 2, 2025 · ec330a4 · ec330a4
1 parent 7e2c185
commit ec330a4
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 20 deletions.
diff --git a/module/common/get_extra.sh b/module/common/get_extra.sh
@@ -92,7 +92,7 @@ release_note() {
 awk '
     /^### v[0-9]+\.[0-9]+$/ { 
         if (!found) {
-            version = $2; 
+            version = $0;
             found = 1; 
             next 
         } else {

diff --git a/module/webui/scripts/marked.min.js b/module/webui/scripts/marked.min.js
diff --git a/module/webui/scripts/update.js b/module/webui/scripts/update.js
@@ -1,4 +1,4 @@
-import { basePath, execCommand, showPrompt, noConnection } from './main.js';
+import { basePath, execCommand, showPrompt, noConnection, linkRedirect } from './main.js';
 import { updateCard } from './applist.js';
 
 const updateCardText = document.getElementById('redirect-to-release');
@@ -55,14 +55,23 @@ function setupUpdateMenu() {
                 showPrompt("prompt.downloaded");
             }
             const changelog = await execCommand(`sh ${basePath}common/get_extra.sh --release-note`);
-            const lines = changelog
+            window.linkRedirect = linkRedirect;
+            marked.setOptions({
+                sanitize: true,
+                walkTokens(token) {
+                    if (token.type === 'link') {
+                        const href = token.href;
+                        token.href = "javascript:void(0);";
+                        token.type = "html";
+                        token.text = `<a href="javascript:void(0);" onclick="linkRedirect('${href}')">${token.text}</a>`;
+                    }
+                }
+            });
+            const cleanedChangelog = changelog
                 .split('\n')
                 .filter(line => line.trim() !== '')
-                .map(line => line.startsWith('- ') ? line.slice(2) : line);
-            const formattedChangelog = `
-                <li class="changelog-title">${lines[0]}</li>
-                ${lines.slice(1).map(line => `<li>${line}</li>`).join('')}
-            `;
+                .join('\n');
+            const formattedChangelog = marked.parse(cleanedChangelog);
             releaseNotes.innerHTML = formattedChangelog;
             openUpdateMenu();
         } catch (error) {

diff --git a/module/webui/styles/applist.css b/module/webui/styles/applist.css
@@ -85,37 +85,39 @@
     overflow-y: auto;
 }
 
-.update-content ul {
-    padding-left: 0;
-    margin: 0;
+.update-content h3 {
+    font-size: 22px;
 }
 
-.changelog-title {
-    font-weight: bold;
-    font-size: 22px;
-    list-style-type: none;
+.update-content ul {
     padding-left: 0;
+    margin: 0;
 }
 
 .update-content ul li {
+    margin-left: 15px;
     margin-bottom: 5px;
+    list-style-type: disc;
 }
 
-.update-content ul li:not(:first-child) {
-    list-style-type: disc;
-    margin-left: 15px;
+.update-content a {
+    color: #6E6E6E;
+    cursor: none;
+}
+
+.update-content a:active {
+    color: blue;
 }
 
 .update-button-container {
     width: 100%;
-    padding: 0;
+    padding-top: 10px;
     display: flex;
     justify-content: flex-end;
 }
 
 .install,
 .reboot {
-    margin-left: 0;
     margin-top: 10px;
     margin-bottom: 15px;
     font-weight: bold;
@@ -357,4 +359,8 @@
     .update-menu {
         background-color: #343434;
     }
+
+    .update-content a {
+        color: #C2C2C2;
+    }
 }