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

Compress and combine emoji data (#5229)

Browse Source
This commit is contained in:
Nolan Lawson
2017-10-05 18:42:34 -07:00
committed by Eugen Rochko
parent eb5ac23434
commit fd7f0732fe
22 changed files with 254 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/reducers/accounts.js
View File

@ -44,7 +44,7 @@ import {
FAVOURITED_STATUSES_EXPAND_SUCCESS,
} from '../actions/favourites';
import { STORE_HYDRATE } from '../actions/store';
import emojify from '../emoji';
import emojify from '../features/emoji/emoji';
import { Map as ImmutableMap, fromJS } from 'immutable';
import escapeTextContentForBrowser from 'escape-html';

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

@ -1,7 +1,7 @@
import { List as ImmutableList } from 'immutable';
import { STORE_HYDRATE } from '../actions/store';
import { search as emojiSearch } from '../emoji_index_light';
import { buildCustomEmojis } from '../emoji';
import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light';
import { buildCustomEmojis } from '../features/emoji/emoji';
const initialState = ImmutableList();

2
app/javascript/mastodon/reducers/statuses.js
View File

@ -39,7 +39,7 @@ import {
PINNED_STATUSES_FETCH_SUCCESS,
} from '../actions/pin_statuses';
import { SEARCH_FETCH_SUCCESS } from '../actions/search';
import emojify from '../emoji';
import emojify from '../features/emoji/emoji';
import { Map as ImmutableMap, fromJS } from 'immutable';
import escapeTextContentForBrowser from 'escape-html';