alfred/cityuni-webserver
1
0
Fork 0
Code Issues Pull Requests Releases Activity

.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Captain ALM 2022-07-30 23:29:12 +01:00
parent 6c49ca08bf
commit 66e603324d
Signed by: alfred
GPG Key ID: 4E4ADD02609997B1
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
index.js
View File

@ -68,10 +68,10 @@ function SetupJSTheme() {
var th = document.getElementById("theme") var th = document.getElementById("theme")
th.href = "#" th.href = "#"
if (document.addEventListener) { if (document.addEventListener) {
th.addEventListener("click", ToggleTheme) th.addEventListener("click", CToggleTheme)
} else { } else {
th.setAttribute("onclick", "ToggleTheme();") th.setAttribute("onclick", "CToggleTheme();")
th.onclick = ToggleTheme th.onclick = CToggleTheme
} }
} }
function cReplaceHistory() { function cReplaceHistory() {
@ -106,7 +106,10 @@ function PushHistory(url) {
document.location.href = url document.location.href = url
} }
} }
function ToggleTheme() { function CToggleTheme() {
ToggleTheme(true)
}
function ToggleTheme(p) {
var th = document.getElementById("theme") var th = document.getElementById("theme")
var thimg = document.getElementById("theme-img") var thimg = document.getElementById("theme-img")
var thsty = document.getElementById("style-theme") var thsty = document.getElementById("style-theme")
@ -119,7 +122,7 @@ function ToggleTheme() {
th.title = "Switch to Light Mode" th.title = "Switch to Light Mode"
document.getElementById("so-form").removeChild(document.getElementById("so-theme")) document.getElementById("so-form").removeChild(document.getElementById("so-theme"))
logo.href = "?" logo.href = "?"
PushHistory(url+"?"+TheParameters+"#") if (p) {PushHistory(url+"?"+TheParameters+"#");}
thsty.href = CssDarkURL thsty.href = CssDarkURL
} else { } else {
thimg.src = MoonImageURL thimg.src = MoonImageURL
@ -131,10 +134,12 @@ function ToggleTheme() {
thi.id = "so-theme" thi.id = "so-theme"
document.getElementById("so-form").appendChild(thi) document.getElementById("so-form").appendChild(thi)
logo.href = "?light" logo.href = "?light"
if (TheParameters === "") { if (p) {
PushHistory(url+"?light#") if (TheParameters === "") {
} else { PushHistory(url + "?light#")
PushHistory(url+"?light&"+TheParameters+"#") } else {
PushHistory(url + "?light&" + TheParameters + "#")
}
} }
thsty.href = CssLightURL thsty.href = CssLightURL
} }
@ -153,10 +158,10 @@ function HandleHistoryPop(event) {
if (event.state) { if (event.state) {
SortOrderEnabled = false SortOrderEnabled = false
var isnl = !document.getElementById("so-theme") var isnl = !document.getElementById("so-theme")
if ((event.state.light && isnl) || (!event.state.light && !isnl)) {ToggleTheme();} if ((event.state.light && isnl) || (!event.state.light && !isnl)) {ToggleTheme(false);}
document.getElementById("so-order").value = event.state.order document.getElementById("so-order").value = event.state.order
document.getElementById("so-sort").value = event.state.sort document.getElementById("so-sort").value = event.state.sort
EntrySort(event.state.order, event.state.sort) EntrySort(event.state.order, event.state.sort, false)
SortOrderEnabled = true SortOrderEnabled = true
} }
} }
@ -216,9 +221,9 @@ function SetupJSSOI() {
SortOrderEnabled = true SortOrderEnabled = true
} }
function HandleSortOrderChange() { function HandleSortOrderChange() {
if (SortOrderEnabled) {EntrySort(document.getElementById("so-order").value, document.getElementById("so-sort").value);} if (SortOrderEnabled) {EntrySort(document.getElementById("so-order").value, document.getElementById("so-sort").value, true);}
} }
function EntrySort(o, s) { function EntrySort(o, s, p) {
var ts = s.toString().toLowerCase() var ts = s.toString().toLowerCase()
var chg = false var chg = false
if (SortValue !== s) { if (SortValue !== s) {
@ -264,10 +269,12 @@ function EntrySort(o, s) {
TheParameters = "order="+OrderValue+"&sort="+SortValue TheParameters = "order="+OrderValue+"&sort="+SortValue
var url = document.location.href var url = document.location.href
url = url.split("#", 1)[0].split('?', 1)[0] url = url.split("#", 1)[0].split('?', 1)[0]
if (document.getElementById("so-theme")) { if (p) {
PushHistory(url+"?light&"+TheParameters) if (document.getElementById("so-theme")) {
} else { PushHistory(url + "?light&" + TheParameters)
PushHistory(url+"?"+TheParameters) } else {
PushHistory(url + "?" + TheParameters)
}
} }
for (var i = 0; i < EntryIndices.length; i++) { for (var i = 0; i < EntryIndices.length; i++) {
var tNode = document.getElementById("entry-"+EntryIndices[i]) var tNode = document.getElementById("entry-"+EntryIndices[i])