Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Timeline should be a feature, not component

Browse Source
This commit is contained in:
kibigo!
2017-06-24 17:10:55 -07:00
parent ff0ecca84c
commit 4d0fde3d93
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/community_timeline/index.js
View File

@@ -6,7 +6,7 @@ import {
} from '../../actions/timelines'; } from '../../actions/timelines';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnSettingsContainer from './containers/column_settings_container'; import ColumnSettingsContainer from './containers/column_settings_container';
import Timeline from '../../components/timeline'; import Timeline from '../timeline';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'column.community', defaultMessage: 'Local timeline' }, title: { id: 'column.community', defaultMessage: 'Local timeline' },

2
app/javascript/mastodon/features/hashtag_timeline/index.js
View File

@@ -5,7 +5,7 @@ import {
expandHashtagTimeline, expandHashtagTimeline,
} from '../../actions/timelines'; } from '../../actions/timelines';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import Timeline from '../../components/timeline'; import Timeline from '../timeline';
export default class HashtagTimeline extends React.PureComponent { export default class HashtagTimeline extends React.PureComponent {

2
app/javascript/mastodon/features/home_timeline/index.js
View File

@@ -4,7 +4,7 @@ import { expandHomeTimeline } from '../../actions/timelines';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnSettingsContainer from './containers/column_settings_container'; import ColumnSettingsContainer from './containers/column_settings_container';
import Timeline from '../../components/timeline'; import Timeline from '../timeline';
import Link from 'react-router-dom/Link'; import Link from 'react-router-dom/Link';
const messages = defineMessages({ const messages = defineMessages({

2
app/javascript/mastodon/features/public_timeline/index.js
View File

@@ -6,7 +6,7 @@ import {
} from '../../actions/timelines'; } from '../../actions/timelines';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnSettingsContainer from './containers/column_settings_container'; import ColumnSettingsContainer from './containers/column_settings_container';
import Timeline from '../../components/timeline'; import Timeline from '../timeline';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'column.public', defaultMessage: 'Federated timeline' }, title: { id: 'column.public', defaultMessage: 'Federated timeline' },

12
app/javascript/mastodon/components/timeline.js → app/javascript/mastodon/features/timeline/index.js
View File

@@ -1,17 +1,17 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import StatusListContainer from '../features/ui/containers/status_list_container'; import StatusListContainer from '../ui/containers/status_list_container';
import Column from './column'; import Column from '../../components/column';
import ColumnHeader from './column_header'; import ColumnHeader from '../../components/column_header';
import { import {
updateTimeline, updateTimeline,
deleteFromTimelines, deleteFromTimelines,
connectTimeline, connectTimeline,
disconnectTimeline, disconnectTimeline,
} from '../actions/timelines'; } from '../../actions/timelines';
import { addColumn, removeColumn, moveColumn } from '../actions/columns'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import createStream from '../stream'; import createStream from '../../stream';
const mapStateToProps = (state, ownprops) => ({ const mapStateToProps = (state, ownprops) => ({
streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']), streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),