treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Moved glitch containers and commented unused files

lolsob-rspec
kibigo! 2017-07-13 02:40:16 -07:00
parent 6574cab679
commit 1b225a979a
24 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/glitch/containers/compose/advanced_options.js → app/javascript/glitch/components/compose/advanced_options/container.js
View File

@ -2,10 +2,10 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
// Mastodon imports // // Mastodon imports //
import { toggleComposeAdvancedOption } from '../../../mastodon/actions/compose'; import { toggleComposeAdvancedOption } from '../../../../mastodon/actions/compose';
// Our imports // // Our imports //
import ComposeAdvancedOptions from '../../components/compose/advanced_options'; import ComposeAdvancedOptions from '.';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
values: state.getIn(['compose', 'advanced_options']), values: state.getIn(['compose', 'advanced_options']),

2
app/javascript/glitch/components/compose/advanced_options.js → app/javascript/glitch/components/compose/advanced_options/index.js
View File

@ -6,7 +6,7 @@ import Toggle from 'react-toggle';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
// Mastodon imports // // Mastodon imports //
import IconButton from '../../../mastodon/components/icon_button'; import IconButton from '../../../../mastodon/components/icon_button';
const messages = defineMessages({ const messages = defineMessages({
local_only_short: { id: 'advanced-options.local-only.short', defaultMessage: 'Local-only' }, local_only_short: { id: 'advanced-options.local-only.short', defaultMessage: 'Local-only' },

2
app/javascript/glitch/containers/notification/index.js → app/javascript/glitch/components/notification/container.js
View File

@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import { makeGetNotification } from '../../../mastodon/selectors'; import { makeGetNotification } from '../../../mastodon/selectors';
// Our imports // // Our imports //
import Notification from '../../components/notification'; import Notification from '.';
const makeMapStateToProps = () => { const makeMapStateToProps = () => {
const getNotification = makeGetNotification(); const getNotification = makeGetNotification();

2
app/javascript/glitch/components/notification/index.js
View File

@ -11,7 +11,7 @@ import Permalink from '../../../mastodon/components/permalink';
import emojify from '../../../mastodon/emoji'; import emojify from '../../../mastodon/emoji';
// Our imports // // Our imports //
import StatusContainer from '../../containers/status'; import StatusContainer from '../status';
export default class Notification extends ImmutablePureComponent { export default class Notification extends ImmutablePureComponent {

0
app/javascript/glitch/containers/settings/index.js → app/javascript/glitch/components/settings/container.js
View File

2
app/javascript/glitch/containers/status/index.js → app/javascript/glitch/components/status/container.js
View File

@ -52,7 +52,7 @@ import { initReport } from '../../../mastodon/actions/reports';
import { openModal } from '../../../mastodon/actions/modal'; import { openModal } from '../../../mastodon/actions/modal';
// Our imports // // Our imports //
import Status from '../../components/status'; import Status from '.';
/* * * * */ /* * * * */

4
app/javascript/glitch/components/status/index.js
View File

@ -46,7 +46,7 @@ import StatusHeader from './header';
import StatusContent from './content'; import StatusContent from './content';
import StatusActionBar from './action_bar'; import StatusActionBar from './action_bar';
import StatusGallery from './gallery'; import StatusGallery from './gallery';
import StatusVideoPlayer from './video_player'; import StatusPlayer from './player';
/* * * * */ /* * * * */
@ -619,7 +619,7 @@ backgrounds for collapsed statuses are enabled.
attachments.getIn([0, 'type']) === 'video' attachments.getIn([0, 'type']) === 'video'
) { ) {
media = ( // Media type is 'video' media = ( // Media type is 'video'
<StatusVideoPlayer <StatusPlayer
media={attachments.get(0)} media={attachments.get(0)}
sensitive={status.get('sensitive')} sensitive={status.get('sensitive')}
letterbox={settings.getIn(['media', 'letterbox'])} letterbox={settings.getIn(['media', 'letterbox'])}

2
app/javascript/glitch/components/status/video_player.js → app/javascript/glitch/components/status/player.js
View File

@ -15,7 +15,7 @@ const messages = defineMessages({
}); });
@injectIntl @injectIntl
export default class StatusVideoPlayer extends React.PureComponent { export default class StatusPlayer extends React.PureComponent {
static propTypes = { static propTypes = {
media: ImmutablePropTypes.map.isRequired, media: ImmutablePropTypes.map.isRequired,

3
app/javascript/mastodon/components/media_gallery.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/gallery
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';

3
app/javascript/mastodon/components/status.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';

3
app/javascript/mastodon/components/status_action_bar.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/action_bar
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';

3
app/javascript/mastodon/components/status_content.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/content
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import escapeTextContentForBrowser from 'escape-html'; import escapeTextContentForBrowser from 'escape-html';

2
app/javascript/mastodon/components/status_list.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { ScrollContainer } from 'react-router-scroll'; import { ScrollContainer } from 'react-router-scroll';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import StatusContainer from '../../glitch/containers/status'; import StatusContainer from '../../glitch/components/status/container';
import LoadMore from './load_more'; import LoadMore from './load_more';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper'; import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';

3
app/javascript/mastodon/components/video_player.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/player
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';

3
app/javascript/mastodon/containers/status_container.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/container
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Status from '../components/status'; import Status from '../components/status';

3
app/javascript/mastodon/features/account/components/header.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/account/header
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';

2
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -11,7 +11,7 @@ import { defineMessages, injectIntl } from 'react-intl';
import Collapsable from '../../../components/collapsable'; import Collapsable from '../../../components/collapsable';
import SpoilerButtonContainer from '../containers/spoiler_button_container'; import SpoilerButtonContainer from '../containers/spoiler_button_container';
import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
import ComposeAdvancedOptionsContainer from '../../../../glitch/containers/compose/advanced_options'; import ComposeAdvancedOptionsContainer from '../../../../glitch/components/compose/advanced_options/container';
import SensitiveButtonContainer from '../containers/sensitive_button_container'; import SensitiveButtonContainer from '../containers/sensitive_button_container';
import EmojiPickerDropdown from './emoji_picker_dropdown'; import EmojiPickerDropdown from './emoji_picker_dropdown';
import UploadFormContainer from '../containers/upload_form_container'; import UploadFormContainer from '../containers/upload_form_container';

2
app/javascript/mastodon/features/compose/components/search_results.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import AccountContainer from '../../../containers/account_container'; import AccountContainer from '../../../containers/account_container';
import StatusContainer from '../../../../glitch/containers/status'; import StatusContainer from '../../../../glitch/components/status/container';
import Link from 'react-router-dom/Link'; import Link from 'react-router-dom/Link';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';

3
app/javascript/mastodon/features/notifications/components/notification.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/notification
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import StatusContainer from '../../../containers/status_container'; import StatusContainer from '../../../containers/status_container';

3
app/javascript/mastodon/features/notifications/containers/notification_container.js
View File

@ -1,3 +1,6 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/notification/container
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { makeGetNotification } from '../../../selectors'; import { makeGetNotification } from '../../../selectors';
import Notification from '../components/notification'; import Notification from '../components/notification';

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

@ -6,7 +6,7 @@ import Column from '../../components/column';
import ColumnHeader from '../../components/column_header'; import ColumnHeader from '../../components/column_header';
import { expandNotifications, scrollTopNotifications } from '../../actions/notifications'; import { expandNotifications, scrollTopNotifications } from '../../actions/notifications';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import NotificationContainer from '../../../glitch/containers/notification'; import NotificationContainer from '../../../glitch/components/notification/container';
import { ScrollContainer } from 'react-router-scroll'; import { ScrollContainer } from 'react-router-scroll';
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';

4
app/javascript/mastodon/features/status/components/detailed_status.js
View File

@ -5,7 +5,7 @@ import Avatar from '../../../components/avatar';
import DisplayName from '../../../components/display_name'; import DisplayName from '../../../components/display_name';
import StatusContent from '../../../../glitch/components/status/content'; import StatusContent from '../../../../glitch/components/status/content';
import StatusGallery from '../../../../glitch/components/status/gallery'; import StatusGallery from '../../../../glitch/components/status/gallery';
import StatusVideoPlayer from '../../../../glitch/components/status/video_player'; import StatusPlayer from '../../../../glitch/components/status/player';
import AttachmentList from '../../../components/attachment_list'; import AttachmentList from '../../../components/attachment_list';
import Link from 'react-router-dom/Link'; import Link from 'react-router-dom/Link';
import { FormattedDate, FormattedNumber } from 'react-intl'; import { FormattedDate, FormattedNumber } from 'react-intl';
@ -48,7 +48,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
media = <AttachmentList media={status.get('media_attachments')} />; media = <AttachmentList media={status.get('media_attachments')} />;
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') { } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
media = ( media = (
<StatusVideoPlayer <StatusPlayer
sensitive={status.get('sensitive')} sensitive={status.get('sensitive')}
media={status.getIn(['media_attachments', 0])} media={status.getIn(['media_attachments', 0])}
letterbox={settings.getIn(['media', 'letterbox'])} letterbox={settings.getIn(['media', 'letterbox'])}

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

@ -22,7 +22,7 @@ import { initReport } from '../../actions/reports';
import { makeGetStatus } from '../../selectors'; import { makeGetStatus } from '../../selectors';
import { ScrollContainer } from 'react-router-scroll'; import { ScrollContainer } from 'react-router-scroll';
import ColumnBackButton from '../../components/column_back_button'; import ColumnBackButton from '../../components/column_back_button';
import StatusContainer from '../../../glitch/containers/status'; import StatusContainer from '../../../glitch/components/status/container';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modal';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';

4
app/javascript/mastodon/features/ui/util/async-components.js
View File

@ -103,11 +103,11 @@ export function ReportModal () {
} }
export function SettingsModal () { export function SettingsModal () {
return import(/* webpackChunkName: "modals/settings_modal" */'../../../../glitch/containers/settings'); return import(/* webpackChunkName: "modals/settings_modal" */'../../../../glitch/components/settings/container');
} }
// THESE AREN'T USED BY US; SEE `glitch/components/status` AND `mastodon/features/status`. // // THESE AREN'T USED BY US; SEE `glitch/components/status` AND `mastodon/features/status`. //
// HOWEVER, IF MASTODON EVER CHANGES DETAILED STATUSES SO THAT THEY NEED THEM, WE'LL NEED TO UPDATE THE URLS OR SOMETHING LOL. // // IF MASTODON EVER CHANGES DETAILED STATUSES TO REQUIRE THEM, WE'LL NEED TO UPDATE THE URLS OR SOMETHING LOL. //
export function MediaGallery () { export function MediaGallery () {
return import(/* webpackChunkName: "status/MediaGallery" */'../../../components/media_gallery'); return import(/* webpackChunkName: "status/MediaGallery" */'../../../components/media_gallery');