Skip to content

Commit 95702a2

Browse files
committed
Fix error when hide-desktop-navigation is true
1 parent 9de6843 commit 95702a2

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

internal/glance/static/js/page.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,9 +689,13 @@ async function changeTheme(key, onChanged) {
689689
}
690690

691691
function initThemeSwitcher() {
692-
find(".mobile-navigation .theme-choices").replaceWith(
693-
find(".header-container .theme-choices").cloneNode(true)
694-
);
692+
const themeChoicesInHeader = find(".header-container .theme-choices");
693+
694+
if (themeChoicesInHeader) {
695+
themeChoicesInHeader.replaceWith(
696+
find(".mobile-navigation .theme-choices").cloneNode(true)
697+
);
698+
}
695699

696700
const presetElems = findAll(".theme-choices .theme-preset");
697701
let themePreviewElems = document.getElementsByClassName("current-theme-preview");

internal/glance/templates/page.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@
3838
{{ .Request.Theme.PreviewHTML }}
3939
</div>
4040
<div data-popover-html>
41-
<div class="theme-choices">
42-
{{ .App.Config.Theme.PreviewHTML }}
43-
{{ range $_, $preset := .App.Config.Theme.Presets.Items }}
44-
{{ $preset.PreviewHTML }}
45-
{{ end }}
46-
</div>
41+
<div class="theme-choices"></div>
4742
</div>
4843
</div>
4944
{{- if .App.RequiresAuth }}
@@ -73,7 +68,12 @@
7368
<div class="mobile-navigation-actions flex flex-column margin-block-10">
7469
<div class="theme-picker flex justify-between items-center" data-popover-type="html" data-popover-position="above" data-popover-show-delay="0" data-popover-hide-delay="100" data-popover-anchor=".current-theme-preview" data-popover-trigger="click">
7570
<div data-popover-html>
76-
<div class="theme-choices"></div>
71+
<div class="theme-choices">
72+
{{ .App.Config.Theme.PreviewHTML }}
73+
{{ range $_, $preset := .App.Config.Theme.Presets.Items }}
74+
{{ $preset.PreviewHTML }}
75+
{{ end }}
76+
</div>
7777
</div>
7878

7979
<div class="size-h3 pointer-events-none select-none">Change theme</div>

0 commit comments

Comments
 (0)