diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-05-22 12:15:21 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-05-22 12:15:21 +0000 |
| commit | 3128ea57e1f0281d4d8f94d868de10b5b97663af (patch) | |
| tree | 69c3c02109dbd502b9daf5d11b0103d550d767f7 /src/modules | |
| parent | 3056017f8e35c98a7fb42162c7e3460a4ebab619 (diff) | |
| parent | 6ea69eb51a480e3ab81a69b99f92165fc97f8177 (diff) | |
Merge branch 'themes3-cache' into 'develop'
implement a simple caching system for themes 3
See merge request pleroma/pleroma-fe!1911
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 1 | ||||
| -rw-r--r-- | src/modules/instance.js | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index 72408932..75b1a0c4 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -28,6 +28,7 @@ export const defaultState = { theme: undefined, customTheme: undefined, customThemeSource: undefined, + forceThemeRecompilation: false, hideISP: false, hideInstanceWallpaper: false, hideShoutbox: false, diff --git a/src/modules/instance.js b/src/modules/instance.js index f12cc735..0a5c1ae7 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -378,7 +378,8 @@ const instance = { commit('setInstanceOption', { name: 'themeData', value: themeData }) // No need to apply theme if there's user theme already const { customTheme } = rootState.config - if (customTheme) return + const { themeApplied } = rootState.interface + if (customTheme || themeApplied) return // New theme presets don't have 'theme' property, they use 'source' const themeSource = themeData.source |