Merge 0a140f351a into 12fcf5f692

📝 Update changelog
🔀 Merge pull request #655 from stereobooster/portable-links
2023-10-24 11:20:55 +11:00 · 2023-10-24 11:16:59 +11:00 · 2023-10-24 11:14:57 +11:00 · 2023-10-24 11:07:56 +11:00 · 2023-10-24 10:53:16 +11:00 · 2023-10-23 02:04:13 +02:00
4 changed files with 33 additions and 23 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

 ## [Unreleased]

+### Changed
+
+- Minor refactor to improve memory efficiency in search results ([#650](https://github.com/jpanther/congo/pull/650))
+- Links in Markdown content are now portable ([#655](https://github.com/jpanther/congo/pull/655))
+
+### Fixed
+
+- JavaScript error setting theme colour when site is loaded in dark mode ([#676](https://github.com/jpanther/congo/issues/676))
+
 ## [2.7.0] - 2023-10-23

 ### Added
--- a/assets/js/search.js
+++ b/assets/js/search.js
@ -133,10 +133,8 @@ function executeQuery(term) {
  let resultsHTML = "";

  if (results.length > 0) {
-    results.forEach(function (value, key) {
-      resultsHTML =
-        resultsHTML +
-        `<li class="mb-2">
+    resultsHTML = results.map(function (value, key) {
+      return `<li class="mb-2">
        <a class="flex items-center px-3 py-2 rounded-md appearance-none bg-neutral-100 dark:bg-neutral-700 focus:bg-primary-100 hover:bg-primary-100 dark:hover:bg-primary-900 dark:focus:bg-primary-900 focus:outline-dotted focus:outline-transparent focus:outline-2" href="${value.item.permalink}" tabindex="0">
          <div class="grow">
            <div class="-mb-1 text-lg font-bold">${value.item.title}</div>
@ -147,7 +145,7 @@ function executeQuery(term) {
          <div class="mr-2 ltr:hidden rtl:block text-neutral-500">&larr;</div>
        </a>
      </li>`;
-    });
+    }).join("");
    hasResults = true;
  } else {
    resultsHTML = "";
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@ -1,7 +1,10 @@
-<a
-  href="{{ .Destination | safeURL }}"
-  {{ with .Title }}title="{{ . }}"{{ end }}
-  {{ if strings.HasPrefix .Destination "http" }}target="_blank" rel="noreferrer noopener"{{ end }}
->
-  {{- .Text | safeHTML -}}
-</a>
+{{ $link := .Destination }}
+{{ $isRemote := strings.HasPrefix $link "http" }}
+{{- if not $isRemote -}}
+{{ $url := urls.Parse .Destination }}
+{{- if $url.Path -}}
+{{ $fragment := "" }}
+{{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
+{{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end }}{{ end -}}
+{{- end -}}
+<a href="{{ $link | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{ .Text | safeHTML }}</a>
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -1,6 +1,7 @@
 <head>
  <meta charset="utf-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="theme-color" content="rgb(255,255,255)" />
  {{/* Title */}}
  {{ if .IsHome -}}
    <title>{{ .Site.Title | emojify }}</title>
@ -102,7 +103,6 @@
    <link rel="icon" type="image/png" sizes="16x16" href="{{ "favicon-16x16.png" | relURL }}" />
    <link rel="manifest" href="{{ "site.webmanifest" | relURL }}" />
  {{ end }}
-  <meta name="theme-color" content="rgb(255,255,255)" />
  {{/* Site Verification */}}
  {{ with .Site.Params.verification.google }}
    <meta name="google-site-verification" content="{{ . }}" />
Author	SHA1	Message	Date
stereobooster	568bcf3a6b	Merge `0a140f351a` into `12fcf5f692`	2023-10-24 11:20:55 +11:00
James Panther	12fcf5f692	📝 Update changelog	2023-10-24 11:16:59 +11:00
James Panther	92eb1f638e	🔀 Merge pull request #655 from stereobooster/portable-links Portable markdown links	2023-10-24 11:14:57 +11:00
James Panther	479bc217d8	🔀 Merge pull request #650 from stereobooster/search-mall-improvement Small improvement in js	2023-10-24 11:07:56 +11:00
James Panther	1c8e681dee	🐛 Fix theme colour error when site is in dark mode Fixes #676	2023-10-24 10:53:16 +11:00
stereobooster	0e697b27ca	fix	2023-10-23 02:04:13 +02:00
stereobooster	fc4120662a	Small improvement in js	2023-10-23 02:03:34 +02:00
stereobooster	95f04231af	add rel=noreferrer	2023-10-23 01:55:35 +02:00
stereobooster	74e53cc7d2	Markdown portable links	2023-09-19 06:59:55 +02:00