Merge pull request #2 from macvim-dev/prerelease-whatsnew-page

ychin · web-flow · commit 6a1513555086 · 2023-10-19T17:21:36.000-07:00
Support pre-release builds in What's New page
diff --git a/_data/releases.yml b/_data/releases.yml
@@ -1,13 +1,19 @@
 # This lists all the releases so the front page can automatically reference the
 # release number and our "What's New" page works.
-- 178
-- 177
-- 176
-- 174
-- 173
-- 172
-- 171
-- 170
-- 169
-- 166
-- 165
+
+# The prereleases list should only be filled if there's an active prerelease.
+# Otherwise it should be empty.
+prereleases:
+
+releases:
+  - 178
+  - 177
+  - 176
+  - 174
+  - 173
+  - 172
+  - 171
+  - 170
+  - 169
+  - 166
+  - 165
diff --git a/_includes/releases/r176.1.html b/_includes/releases/r176.1.html
@@ -1,5 +1,3 @@
-<p>MacVim r176.1 (prerelease)</p>
-
 <p>Updated to Vim 9.0.1403</p>
 
 <ul>
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 ---
 ---
 <!DOCTYPE html>
-{% assign latest_release=site.data.releases[0] %}
+{% assign latest_release=site.data.releases.releases[0] %}
 <html lang="en-us">
   <head>
     <meta charset="UTF-8">
diff --git a/javascripts/main.js b/javascripts/main.js
diff --git a/release-notes/whatsnew.html b/release-notes/whatsnew.html
@@ -74,7 +74,14 @@
     </style>
   </head>
   <body>
-    {% for release in site.data.releases %}
+    {% for release in site.data.releases.prereleases %}
+      <section id={{ release }}>
+        <header> <h1>MacVim r{{ release }} (prerelease)</h1></header>
+        {% include releases/r{{ release }}.html %}
+      </section>
+    {% endfor %}
+
+    {% for release in site.data.releases.releases %}
 
       {% comment %}
       We try to show more than 1 releases in case the user is doing a multiple
@@ -100,18 +107,18 @@
       let fromRev = NaN;
       let toRev = NaN;
       if (params.has('from') && params.has('to')) {
-        fromRev = parseInt(params.get('from'));
-        toRev = parseInt(params.get('to'));
+        fromRev = parseFloat(params.get('from'));
+        toRev = parseFloat(params.get('to'));
       }
       else if (params.has('version')) {
-        toRev = parseInt(params.get('version'));
+        toRev = parseFloat(params.get('version'));
         fromRev = toRev - 1;
       }
       if (!isNaN(fromRev) && !isNaN(toRev)) {
         let foundOne = false;
         let sections = document.getElementsByTagName('section');
         for (let i = 0; i < sections.length; i++) {
-          const secRev = parseInt(sections[i].id);
+          const secRev = parseFloat(sections[i].id);
           if (!isNaN(secRev)) {
             if (secRev <= fromRev || secRev > toRev)
               sections[i].style.display = 'none';
@@ -122,7 +129,7 @@
           }
         }
         if (!foundOne) {
-          sections[0].style.display = 'block'; // Just show the latest if the input range is not valid so we don't show an empty page
+          document.getElementsByClassName('item-0')[0].style.display = 'block'; // Just show the latest if the input range is not valid so we don't show an empty page
         }
       }
     </script>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-<p>MacVim r176.1 (prerelease)</p>`
`2`		`-`
`3`	`1`	`<p>Updated to Vim 9.0.1403</p>`
`4`	`2`
`5`	`3`	`<ul>`