Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce differences with upstream due to import style (#2465)

Browse Source 
Fix relative / VS absolute style imports, and fix whitespace discrepancies
This commit is contained in:
Claire
2023-11-15 12:01:51 +01:00
committed by GitHub
parent f7d3b74e03
commit a97b722ad5
120 changed files with 379 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/features/compose/containers/autosuggest_account_container.js
View File

@@ -1,7 +1,6 @@
import { connect } from 'react-redux';
import { makeGetAccount } from 'flavours/glitch/selectors';
import { makeGetAccount } from '../../../selectors';
import AutosuggestAccount from '../components/autosuggest_account';
const makeMapStateToProps = () => {

18
app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
View File

@@ -2,24 +2,24 @@ import { defineMessages, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
import {
changeCompose,
submitCompose,
clearComposeSuggestions,
fetchComposeSuggestions,
selectComposeSuggestion,
changeComposeSpoilerText,
changeComposeSpoilerness,
changeComposeVisibility,
clearComposeSuggestions,
fetchComposeSuggestions,
insertEmojiCompose,
selectComposeSuggestion,
submitCompose,
uploadCompose,
} from 'flavours/glitch/actions/compose';
import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
} from '../../../actions/compose';
import { changeLocalSetting } from '../../../actions/local_settings';
import {
openModal,
} from 'flavours/glitch/actions/modal';
import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
} from '../../../actions/modal';
import ComposeForm from '../components/compose_form';
const messages = defineMessages({

5
app/javascript/flavours/glitch/features/compose/containers/emoji_picker_dropdown_container.js
View File

@@ -2,9 +2,8 @@ import { Map as ImmutableMap } from 'immutable';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { useEmoji } from 'flavours/glitch/actions/emojis';
import { changeSetting } from 'flavours/glitch/actions/settings';
import { useEmoji } from '../../../actions/emojis';
import { changeSetting } from '../../../actions/settings';
import EmojiPickerDropdown from '../components/emoji_picker_dropdown';
const perLine = 8;

2
app/javascript/flavours/glitch/features/compose/containers/navigation_container.js
View File

@@ -3,9 +3,9 @@ import { defineMessages, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import { openModal } from 'flavours/glitch/actions/modal';
import { me } from 'flavours/glitch/initial_state';
import { logOut } from 'flavours/glitch/utils/log_out';
import { me } from '../../../initial_state';
import NavigationBar from '../components/navigation_bar';
const messages = defineMessages({

3
app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
View File

@@ -8,8 +8,7 @@ import {
clearComposeSuggestions,
fetchComposeSuggestions,
selectComposeSuggestion,
} from 'flavours/glitch/actions/compose';
} from '../../../actions/compose';
import PollForm from '../components/poll_form';
const mapStateToProps = state => ({

7
app/javascript/flavours/glitch/features/compose/containers/privacy_dropdown_container.js
View File

@@ -1,9 +1,8 @@
import { connect } from 'react-redux';
import { changeComposeVisibility } from 'flavours/glitch/actions/compose';
import { openModal, closeModal } from 'flavours/glitch/actions/modal';
import { isUserTouching } from 'flavours/glitch/is_mobile';
import { changeComposeVisibility } from '../../../actions/compose';
import { openModal, closeModal } from '../../../actions/modal';
import { isUserTouching } from '../../../is_mobile';
import PrivacyDropdown from '../components/privacy_dropdown';
const mapStateToProps = state => ({

3
app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js
View File

@@ -1,7 +1,6 @@
import { connect } from 'react-redux';
import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
import { cancelReplyCompose } from '../../../actions/compose';
import ReplyIndicator from '../components/reply_indicator';
const makeMapStateToProps = () => {

3
app/javascript/flavours/glitch/features/compose/containers/upload_container.js
View File

@@ -1,7 +1,6 @@
import { connect } from 'react-redux';
import { undoUploadCompose, initMediaEditModal, submitCompose } from 'flavours/glitch/actions/compose';
import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose';
import Upload from '../components/upload';
const mapStateToProps = (state, { id }) => ({

1
app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx
View File

@@ -10,7 +10,6 @@ import { HASHTAG_PATTERN_REGEX } from 'flavours/glitch/utils/hashtags';
import Warning from '../components/warning';
const mapStateToProps = state => ({
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
hashtagWarning: state.getIn(['compose', 'privacy']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),