mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Fix accidentally importing vanilla code in glitch-soc flavor (#1863)

This commit is contained in:
Claire 2022-10-11 19:35:37 +02:00 committed by GitHub
parent b01faa7375
commit 18f210aff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/main.js
View File

@ -30,7 +30,7 @@ function main() {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
const [{ Workbox }, { me }] = await Promise.all([ const [{ Workbox }, { me }] = await Promise.all([
import('workbox-window'), import('workbox-window'),
import('mastodon/initial_state'), import('flavours/glitch/initial_state'),
]); ]);
const wb = new Workbox('/sw.js'); const wb = new Workbox('/sw.js');

2
app/javascript/flavours/glitch/reducers/tags.js
View File

@ -4,7 +4,7 @@ import {
HASHTAG_FOLLOW_FAIL, HASHTAG_FOLLOW_FAIL,
HASHTAG_UNFOLLOW_REQUEST, HASHTAG_UNFOLLOW_REQUEST,
HASHTAG_UNFOLLOW_FAIL, HASHTAG_UNFOLLOW_FAIL,
} from 'mastodon/actions/tags'; } from 'flavours/glitch/actions/tags';
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
const initialState = ImmutableMap(); const initialState = ImmutableMap();