diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-11-30 19:16:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-30 19:16:32 +0100 |
commit | 3948b6fa523dc5ebc8cde32b4b8d6a055788f8fb (patch) | |
tree | 7abd6dafcecef02c35e7db1b56b2a2c171392a2d /app/javascript | |
parent | d0453e77dc44ec081b1642e8dd8ac9f265403962 (diff) |
Remove npm-run-all dependency (#9401)
Fix #9359
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/actions/timelines.js | 2 | ||||
-rw-r--r-- | app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js index 81c4c8425..215adc4ea 100644 --- a/app/javascript/mastodon/actions/timelines.js +++ b/app/javascript/mastodon/actions/timelines.js @@ -15,7 +15,7 @@ export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP'; export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT'; export function updateTimeline(timeline, status, accept) { - return (dispatch, getState) => { + return dispatch => { if (typeof accept === 'function' && !accept(status)) { return; } diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js index 82936c838..9c9f62d82 100644 --- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js +++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js @@ -5,8 +5,8 @@ import { injectIntl, FormattedMessage } from 'react-intl'; import Toggle from 'react-toggle'; import AsyncSelect from 'react-select/lib/Async'; -@injectIntl -export default class ColumnSettings extends React.PureComponent { +export default @injectIntl +class ColumnSettings extends React.PureComponent { static propTypes = { settings: ImmutablePropTypes.map.isRequired, |