Skip to content

chore: refactor displayMode #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-paul merged 1 commit into from
Oct 3, 2026
Merged

chore: refactor displayMode #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
</head>
<body>

Expand All @@ -29,12 +26,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
83 changes: 71 additions & 12 deletions assets/js/display-mode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,76 @@
// Get mode from local storage
function getDisplayMode() { return localStorage.getItem('mode') || 'system'; }
// Save mode to local storage
function setDisplayMode(mode) { localStorage.setItem('mode', mode); }
// Determine theme from mode name
"use strict";
const DISPLAY_MODE_STORAGE_KEY = 'mode';

// Get mode from local storage.
function getDisplayMode() { return localStorage.getItem(DISPLAY_MODE_STORAGE_KEY) || 'system'; }

// Save mode to local storage.
function setDisplayMode(mode) { localStorage.setItem(DISPLAY_MODE_STORAGE_KEY, mode); }

// Determine theme from mode name.
function modeToTheme(mode) {
if (mode === 'light' || mode === 'dark') { return mode; }
if (matchMedia('(prefers-color-scheme: light').matches) { return 'light'; }
return 'dark';
if(mode === 'light' || mode === 'dark') { return mode; }
if(matchMedia('(prefers-color-scheme: light)').matches) { return 'light'; }
return 'dark';
}
// Change the mode

// Change the mode.
function changeMode(mode) {
document.documentElement.dataset.appliedTheme = modeToTheme(mode);
setDisplayMode(mode);
document.documentElement.dataset.appliedTheme = modeToTheme(mode);
setDisplayMode(mode);
}
// Initialise mode

// Initialise mode.
document.documentElement.dataset.appliedTheme = modeToTheme(getDisplayMode());

function setDisplayModeIcon(mode) {
let iconClass = "fa fa-circle-half-stroke";
let title = "OS Default"
if(mode === 'light') {
iconClass = "fa fa-sun";
title = "Light Theme";
} else if(mode === 'dark') {
iconClass = "fa fa-moon";
title = "Dark Theme";
}
const icon = document.querySelector('#displayMode .currentMode i');
const currentMode = document.querySelector('#displayMode .currentMode');

if(!icon || !currentMode) {
return;
}

icon.className = iconClass;
currentMode.title = title;
}

function initDisplayMode() {
const displayMode = document.querySelector('#displayMode');
const currentMode = displayMode?.querySelector('.currentMode');
const modePicker = displayMode?.querySelector('.pickMode');

if(!currentMode || !modePicker) {
return;
}

setDisplayModeIcon(getDisplayMode());
currentMode.addEventListener('click', () => {
modePicker.style.display = 'block';
});

modePicker.querySelectorAll('li').forEach((item) => {
item.addEventListener('click', () => {
const mode = item.className;
changeMode(mode);
setDisplayModeIcon(mode);
modePicker.style.display = 'none';
});
});
}

// Failsafe loading pattern.
if(document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", initDisplayMode);
} else {
initDisplayMode();
}
28 changes: 0 additions & 28 deletions assets/js/header.js
View file
Open in desktop

This file was deleted.

15 changes: 6 additions & 9 deletions community.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
</head>
<body>

Expand All @@ -29,12 +26,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
15 changes: 6 additions & 9 deletions documentation-articles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
</head>
<body>

Expand All @@ -29,12 +26,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
15 changes: 6 additions & 9 deletions documentation-books.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
</head>
<body>

Expand All @@ -31,12 +28,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
15 changes: 6 additions & 9 deletions documentation-videos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
</head>
<body>

Expand All @@ -29,12 +26,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
15 changes: 6 additions & 9 deletions documentation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
</head>
<body>

Expand All @@ -29,12 +26,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
13 changes: 6 additions & 7 deletions downloads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/header.js"></script>
<script>
var fileinfo = {};
</script>
Expand Down Expand Up @@ -61,12 +60,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
13 changes: 6 additions & 7 deletions gallery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<script src="assets/js/jquery-1.9.1.min.js"></script>

<script src="assets/js/gallery.js"></script>
<script src="assets/js/header.js"></script>
<script>
function gallery(data) { _gallery = data; }
</script>
Expand All @@ -35,12 +34,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
16 changes: 8 additions & 8 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">

<script src="assets/js/jquery-1.9.1.min.js"></script>

<script type="text/javascript">
var fileinfo = {};
Expand All @@ -33,7 +32,8 @@
}
</script>
<script src="inc/releases.js"></script>
<script src="assets/js/header.js"></script>

<script src="assets/js/jquery-1.9.1.min.js"></script>
<script src="assets/js/home.js"></script>
</head>
<body>
Expand All @@ -48,12 +48,12 @@
</a>
</div>
<div id="displayMode" class="right">
<div class="currentMode"><i class="fa fa-circle-half-stroke"></i> Theme</div>
<ul class="pickMode" style="display: none;">
<li class="system"><i class="fa fa-circle-half-stroke"></i> OS Default</li>
<li class="light"><i class="fa fa-sun"></i> Light</li>
<li class="dark"><i class="fa fa-moon"></i> Dark</li>
</ul>
<div class="currentMode"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> Theme</div>
<ul class="pickMode" hidden>
<li class="system"><i class="fa fa-circle-half-stroke" aria-hidden="true"></i> OS Default</li>
<li class="light"><i class="fa fa-sun" aria-hidden="true"></i> Light</li>
<li class="dark"><i class="fa fa-moon" aria-hidden="true"></i> Dark</li>
</ul>
</div>
<div id="title" style="margin-top:35px; width:620px;">
<h1 class="title" style="position:relative;"><span class="green">Open</span>SCAD</h1>
Expand Down
Loading
Loading