erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix broken dependency on inner react utility function

Browse source
This commit is contained in:
Eugen Rochko 2017-02-26 01:34:56 +01:00
parent e2209e1104
commit b44dd38360
7 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/components/display_name.jsx
View file

@ -1,6 +1,6 @@
import ImmutablePropTypes from 'react-immutable-proptypes';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser';
import escapeTextContentForBrowser from 'escape-html';
import emojify from '../emoji';
const DisplayName = React.createClass({

2
app/assets/javascripts/components/components/status.jsx
View file

@ -9,7 +9,7 @@ import StatusContent from './status_content';
import StatusActionBar from './status_action_bar';
import { FormattedMessage } from 'react-intl';
import emojify from '../emoji';
import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser';
import escapeTextContentForBrowser from 'escape-html';
const Status = React.createClass({

2
app/assets/javascripts/components/components/status_content.jsx
View file

@ -1,6 +1,6 @@
import ImmutablePropTypes from 'react-immutable-proptypes';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser';
import escapeTextContentForBrowser from 'escape-html';
import emojify from '../emoji';
import { FormattedMessage } from 'react-intl';
import Permalink from './permalink';

2
app/assets/javascripts/components/features/account/components/header.jsx
View file

@ -1,7 +1,7 @@
import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes';
import emojify from '../../../emoji';
import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser';
import escapeTextContentForBrowser from 'escape-html';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import IconButton from '../../../components/icon_button';

2
app/assets/javascripts/components/features/notifications/components/notification.jsx
View file

@ -5,7 +5,7 @@ import AccountContainer from '../../../containers/account_container';
import { FormattedMessage } from 'react-intl';
import Permalink from '../../../components/permalink';
import emojify from '../../../emoji';
import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser';
import escapeTextContentForBrowser from 'escape-html';
const linkStyle = {
fontWeight: '500'

1
package.json
View file

@ -26,6 +26,7 @@
"emojione": "latest",
"enzyme": "^2.7.1",
"es6-promise": "^3.2.1",
"escape-html": "^1.0.3",
"eventsource": "^0.2.1",
"express": "^4.14.1",
"http-link-header": "^0.5.0",

2
yarn.lock
View file

@ -2409,7 +2409,7 @@ es6-symbol@3, es6-symbol@^3.0.2, es6-symbol@~3.1:
d "~0.1.1"
es5-ext "~0.10.11"
escape-html@~1.0.3:
escape-html@^1.0.3, escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"