diff options
| author | Henry Jameson <me@hjkos.com> | 2024-07-12 02:40:57 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2024-07-12 02:40:57 +0300 |
| commit | e029732021f67e13ca20c1b80c1315c4935b9f2b (patch) | |
| tree | 10afe14811ac376fa34c99738a607deb951f66c1 /src/modules | |
| parent | cd92eb56e097cbc9a42b31ceb9cf2f0bd94967db (diff) | |
use separate action for setting Theme V2
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 11 | ||||
| -rw-r--r-- | src/modules/interface.js | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index 56151d2a..109f2742 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -255,6 +255,11 @@ const config = { revert }) }, + setThemeV2 ({ commit, dispatch }, { customTheme, customThemeSource }) { + commit('setOption', { name: 'customTheme', value: customTheme }) + commit('setOption', { name: 'customThemeSource', value: customThemeSource }) + dispatch('setTheme', { themeData: customThemeSource, recompile: true }) + }, setOption ({ commit, dispatch, state }, { name, value }) { const exceptions = new Set([ 'useStreamingApi' @@ -272,6 +277,7 @@ const config = { dispatch('disableMastoSockets') dispatch('setOption', { name: 'useStreamingApi', value: false }) }) + break } } } else { @@ -286,11 +292,6 @@ const config = { case 'theme': dispatch('setTheme', { themeName: value, recompile: true }) break - case 'customTheme': - case 'customThemeSource': { - if (!value.ignore) dispatch('setTheme', { themeData: value }) - break - } case 'themeDebug': { dispatch('setTheme', { recompile: true }) break diff --git a/src/modules/interface.js b/src/modules/interface.js index a2a7728a..6a749bc3 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -255,10 +255,8 @@ const interfaceMod = { let promise = null if (themeName) { - // commit('setInstanceOption', { name: 'theme', value: themeName }) promise = getPreset(themeName) .then(themeData => { - // commit('setInstanceOption', { name: 'themeData', value: themeData }) return normalizeThemeData(themeData) }) } else if (themeData) { |