From 54ad9946e3fa32ae8388d54ec8b3baad78a29417 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 10 Jan 2023 20:20:18 -0400
Subject: prefer passing around pagePath

---
 src/write/page-template.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/write/page-template.js')

diff --git a/src/write/page-template.js b/src/write/page-template.js
index 88d81c23..7c2f0c66 100644
--- a/src/write/page-template.js
+++ b/src/write/page-template.js
@@ -55,11 +55,10 @@ export function generateDocumentHTML(pageInfo, {
   languages,
   localizedPathnames,
   oEmbedJSONHref,
-  pageSubKey,
+  pagePath,
   pathname,
   to,
   transformMultiline,
-  urlArgs,
   wikiData,
 }) {
   const {wikiInfo} = wikiData;
@@ -169,9 +168,8 @@ export function generateDocumentHTML(pageInfo, {
           html,
           language,
           languages,
-          pageSubKey,
+          pagePath,
           to,
-          urlArgs,
         }),
       ]);
 
@@ -450,10 +448,9 @@ export function generateDocumentHTML(pageInfo, {
     {
       lang: language.intlCode,
       'data-language-code': language.code,
-      'data-url-key': 'localized.' + pageSubKey,
+      'data-url-key': 'localized.' + pagePath[0],
       ...Object.fromEntries(
-        urlArgs.map((v, i) => [['data-url-value' + i], v])
-      ),
+        pagePath.slice(1).map((v, i) => [['data-url-value' + i], v])),
       'data-rebase-localized': to('localized.root'),
       'data-rebase-shared': to('shared.root'),
       'data-rebase-media': to('media.root'),
-- 
cgit 1.3.0-6-gf8a5


From c09e733544f8f47850532aecee4d14887ffd83db Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 10 Jan 2023 20:39:21 -0400
Subject: remove unused arg from getFooterLocalizationLinks

eslint didn't warn about this ????????????
---
 src/write/page-template.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/write/page-template.js')

diff --git a/src/write/page-template.js b/src/write/page-template.js
index 7c2f0c66..0bf0a98e 100644
--- a/src/write/page-template.js
+++ b/src/write/page-template.js
@@ -163,7 +163,7 @@ export function generateDocumentHTML(pageInfo, {
           },
           footer.content),
 
-        getFooterLocalizationLinks(pathname, {
+        getFooterLocalizationLinks({
           defaultLanguage,
           html,
           language,
-- 
cgit 1.3.0-6-gf8a5


From d0abc02e2cf6e5648d1e0c2833bb109fd4976e0e Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 10 Jan 2023 20:41:19 -0400
Subject: remove legacy navbar {href} handler

this references pathname so it totally makes sense to include
with other url/path-related changes
---
 src/write/page-template.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/write/page-template.js')

diff --git a/src/write/page-template.js b/src/write/page-template.js
index 0bf0a98e..6ed9fcf5 100644
--- a/src/write/page-template.js
+++ b/src/write/page-template.js
@@ -1,7 +1,6 @@
 import chroma from 'chroma-js';
 
 import * as html from '../util/html.js';
-import {logWarn} from '../util/cli.js';
 import {getColors} from '../util/colors.js';
 
 import {
@@ -263,11 +262,6 @@ export function generateDocumentHTML(pageInfo, {
           ? to('localized.home')
           : cur.path
           ? to(...cur.path)
-          : cur.href
-          ? (() => {
-              logWarn`Using legacy href format nav link in ${pathname}`;
-              return cur.href;
-            })()
           : null,
       };
       if (attributes.href === null) {
-- 
cgit 1.3.0-6-gf8a5