moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made it actually work, the forceSnapshot

This commit is contained in:
Henry Jameson 2020-01-22 02:53:40 +02:00
parent d98e31af45
commit c7f42b7799
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/style_switcher/style_switcher.js
View File

@ -390,11 +390,6 @@ export default {
const snapshotEngineVersion = (theme || {}).themeEngineVersion const snapshotEngineVersion = (theme || {}).themeEngineVersion
const themeEngineVersion = (source || {}).themeEngineVersion || 2 const themeEngineVersion = (source || {}).themeEngineVersion || 2
const versionsMatch = themeEngineVersion === CURRENT_VERSION const versionsMatch = themeEngineVersion === CURRENT_VERSION
console.log(
theme !== undefined,
source !== undefined,
themeEngineVersion !== snapshotEngineVersion
)
const sourceSnapshotMismatch = ( const sourceSnapshotMismatch = (
theme !== undefined && theme !== undefined &&
source !== undefined && source !== undefined &&
@ -442,7 +437,7 @@ export default {
forceLoad () { forceLoad () {
const { origin } = this.themeWarning const { origin } = this.themeWarning
switch (origin) { switch (origin) {
case 'localstorage': case 'localStorage':
this.loadThemeFromLocalStorage(true) this.loadThemeFromLocalStorage(true)
break break
case 'file': case 'file':
@ -451,10 +446,10 @@ export default {
} }
this.dismissWarning() this.dismissWarning()
}, },
forceSnapshot() { forceSnapshot () {
const { origin } = this.themeWarning const { origin } = this.themeWarning
switch (origin) { switch (origin) {
case 'localstorage': case 'localStorage':
this.loadThemeFromLocalStorage(false, true) this.loadThemeFromLocalStorage(false, true)
break break
case 'file': case 'file':

2
src/components/style_switcher/style_switcher.vue
View File

@ -16,7 +16,7 @@
</button> </button>
<button <button
class="btn" class="btn"
@click="dismissWarning" @click="forceSnapshot"
> >
{{ $t('settings.style.switcher.use_snapshot') }} {{ $t('settings.style.switcher.use_snapshot') }}
</button> </button>