tweak layout static settings

pull/9334/head
Thibault Duplessis 2021-07-02 12:44:34 +02:00
parent 4d0b82e17c
commit 531dffb34c
3 changed files with 8 additions and 8 deletions

View File

@ -23,7 +23,7 @@ object embed {
),
st.body(cls := s"base highlight ${config.board}")(
layout.dataSoundSet := SoundSet.silent.key,
layout.dataAssetUrl := netConfig.assetBaseUrl,
layout.dataAssetUrl,
layout.dataAssetVersion := assetVersion.value,
layout.dataTheme := config.bg,
body

View File

@ -175,15 +175,15 @@ object layout {
private val dataVapid = attr("data-vapid")
private val dataUser = attr("data-user")
private val dataSocketDomains = attr("data-socket-domains")
private val dataSocketDomains = attr("data-socket-domains") := netConfig.socketDomains.mkString(",")
private val dataI18n = attr("data-i18n")
private val dataNonce = attr("data-nonce")
private val dataAnnounce = attr("data-announce")
val dataSoundSet = attr("data-sound-set")
val dataTheme = attr("data-theme")
val dataAssetUrl = attr("data-asset-url")
val dataAssetUrl = attr("data-asset-url") := netConfig.assetBaseUrl
val dataAssetVersion = attr("data-asset-version")
val dataDev = attr("data-dev")
val dataDev = attr("data-dev") := (!netConfig.minifiedAssets).option("true")
def apply(
title: String,
@ -259,12 +259,12 @@ object layout {
"playing fixed-scroll" -> playing
)
},
dataDev := (!netConfig.minifiedAssets).option("true"),
dataDev,
dataVapid := vapidPublicKey,
dataUser := ctx.userId,
dataSoundSet := ctx.currentSoundSet.toString,
dataSocketDomains := netConfig.socketDomains.mkString(","),
dataAssetUrl := netConfig.assetBaseUrl,
dataSocketDomains,
dataAssetUrl,
dataAssetVersion := assetVersion.value,
dataNonce := ctx.nonce.ifTrue(sameAssetDomain).map(_.value),
dataTheme := ctx.currentBg,

View File

@ -306,7 +306,7 @@ export default class StrongSocket {
};
baseUrl = () => {
const baseUrls = document.body.getAttribute('data-socket-domains')!.split(',');
const baseUrls = document.body.dataset.socketDomains!.split(',');
let url = this.storage.get();
if (!url || this.tryOtherUrl) {
url = baseUrls[Math.floor(Math.random() * baseUrls.length)];