tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retrieve custom emoji list via API instead of before page load (#7047)

Browse Source
This commit is contained in:
Isatis
2018-04-04 13:25:34 -07:00
committed by Eugen Rochko
parent f1867a7388
commit b08ab329f4
4 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/mastodon/reducers/custom_emojis.js
View File

@ -1,16 +1,15 @@
import { List as ImmutableList } from 'immutable';
import { STORE_HYDRATE } from '../actions/store';
import { List as ImmutableList, fromJS as ConvertToImmutable } from 'immutable';
import { CUSTOM_EMOJIS_FETCH_SUCCESS } from '../actions/custom_emojis';
import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light';
import { buildCustomEmojis } from '../features/emoji/emoji';
const initialState = ImmutableList();
const initialState = ImmutableList([]);
export default function custom_emojis(state = initialState, action) {
switch(action.type) {
case STORE_HYDRATE:
emojiSearch('', { custom: buildCustomEmojis(action.state.get('custom_emojis', [])) });
return action.state.get('custom_emojis');
default:
return state;
if(action.type === CUSTOM_EMOJIS_FETCH_SUCCESS) {
state = ConvertToImmutable(action.custom_emojis);
emojiSearch('', { custom: buildCustomEmojis(state) });
}
return state;
};