From 926c1a43e0fed2c40928e1da2568437e2ced1f6e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 28 Nov 2024 17:21:39 +0200 Subject: [PATCH] test --- src/modules/interface.js | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/modules/interface.js b/src/modules/interface.js index 8d05dea49..490431905 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -331,7 +331,7 @@ const interfaceMod = { } else { result.nameUsed = name - if (result.nameUsed === 'stock') { + if (result.nameUsed == null) { result.dataUsed = null return result } @@ -448,8 +448,10 @@ const interfaceMod = { ) state.paletteNameUsed = palette.nameUsed state.paletteDataUsed = palette.dataUsed - state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent - state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link + if (state.paletteDataUsed) { + state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent + state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link + } if (Array.isArray(state.paletteDataUsed)) { const [ name, @@ -492,6 +494,20 @@ const interfaceMod = { userThemeV2Source || userThemeV2Snapshot, userThemeV2Name || instanceThemeV2Name ) + console.log( + 'V2 INDEX', + themesIndex + ) + console.log( + 'V2 DATA', + userThemeV2Source, + userThemeV2Snapshot + ) + console.log( + 'V2 NAME', + userThemeV2Name, + instanceThemeV2Name + ) // themeNameUsed = theme.nameUsed state.themeDataUsed = theme.dataUsed } @@ -545,9 +561,12 @@ const interfaceMod = { return result })() + console.log(state.themeNameUsed, state.themeDataUsed) const theme2ruleset = state.themeDataUsed && convertTheme2To3(normalizeThemeData(state.themeDataUsed)) const hacks = [] + console.log('T2R', theme2ruleset) + Object.entries(theme3hacks).forEach(([key, value]) => { switch (key) { case 'fonts': {