diff options
| author | Sorin Davidoi <sorin.davidoi@gmail.com> | 2017-08-07 20:32:03 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-07 20:32:03 +0200 |
| commit | 8eb6d171e690e013eb2881478cfa1fd50b4ba705 (patch) | |
| tree | c0b2305a4bbe66298771699c42d6ce74c2373365 /app/javascript/mastodon/features/follow_requests/components/account_authorize.js | |
| parent | 594234740788a51fa528152343eb50dc1c6ca093 (diff) | |
feat: Cache status height to avoid expensive renders (#4439)
* feat: Cache status height to avoid expensive renders * feat: Escape content and emojify in reducers * fix(css): Remove backface-visibility: hidden from .scrollable * fix(statuses): Avoid creating DOMParses inside a loop
Diffstat (limited to 'app/javascript/mastodon/features/follow_requests/components/account_authorize.js')
| -rw-r--r-- | app/javascript/mastodon/features/follow_requests/components/account_authorize.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js index 66fa5c235..4fc5638d9 100644 --- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js +++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js @@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import Permalink from '../../../components/permalink'; import Avatar from '../../../components/avatar'; import DisplayName from '../../../components/display_name'; -import emojify from '../../../emoji'; import IconButton from '../../../components/icon_button'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; @@ -26,7 +25,7 @@ export default class AccountAuthorize extends ImmutablePureComponent { render () { const { intl, account, onAuthorize, onReject } = this.props; - const content = { __html: emojify(account.get('note')) }; + const content = { __html: account.get('note_emojified') }; return ( <div className='account-authorize__wrapper'> |