Merge pull request #1269 from gethinode/develop

Fix link cleaning and navbar menu check
gethinode · Oct 25, 2024 · a746fd1 · a746fd1
2 parents bba9629 + d0410af
commit a746fd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/layouts/partials/assets/link.html b/layouts/partials/assets/link.html
@@ -18,10 +18,10 @@
 {{ if not $u.Scheme }}
     {{ $b := urls.Parse site.BaseURL }}
     {{ $destination = strings.TrimPrefix $b.Path $destination }}
+    {{ $destination = path.Clean $destination }}
 {{ else }}
     {{ $destination = (strings.TrimPrefix (strings.TrimSuffix "/" site.BaseURL) $destination) }}
 {{ end }}
-{{ $destination = path.Clean $destination }}
 {{ if not $destination }}{{ $destination = "/" }}{{ end }}
 
 {{- $target := "" -}}

diff --git a/layouts/partials/assets/navbar-item.html b/layouts/partials/assets/navbar-item.html
@@ -85,7 +85,7 @@
             "size" "sm"
         )}}
     {{ else }}
-        {{ cond $menuURL "<a" "<div" | safeHTML }} class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
+        {{ cond (ne $menuURL "") "<a" "<div" | safeHTML }} class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
             {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
             data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
             {{ if $menuURL }} href="{{ $menuURL }}{{ $params | safeHTML }}"{{ with $externalHref }} {{ . | safeHTML }}{{ end }}{{ end }} {{ $button | safeHTML }}>
@@ -100,6 +100,6 @@
             <span {{ if $isActive }} class="active"{{ end }}>{{ if or (not $isIcon) $plain }}{{ $menu.Name }}{{ end }}</span>
             {{- with $menu.Post }}{{ . }}{{ end -}}
             {{- if not $isIcon }}&nbsp;{{ $suffix }}{{ end -}}
-        {{ cond $menuURL "</a>" "</div>" | safeHTML }}
+        {{ cond (ne $menuURL "") "</a>" "</div>" | safeHTML }}
     {{ end }}
 {{ end }}