cleanup JS imports and other minor stuff
This commit is contained in:
parent
c898de9aba
commit
c53ff0fecc
13 changed files with 15 additions and 45 deletions
|
@ -429,14 +429,12 @@ export const addReactionRequest = (statusId, name) => ({
|
||||||
type: REACTION_ADD_REQUEST,
|
type: REACTION_ADD_REQUEST,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const addReactionSuccess = (statusId, name) => ({
|
export const addReactionSuccess = (statusId, name) => ({
|
||||||
type: REACTION_ADD_SUCCESS,
|
type: REACTION_ADD_SUCCESS,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const addReactionFail = (statusId, name, error) => ({
|
export const addReactionFail = (statusId, name, error) => ({
|
||||||
|
@ -444,7 +442,6 @@ export const addReactionFail = (statusId, name, error) => ({
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
error,
|
error,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const removeReaction = (statusId, name) => (dispatch, getState) => {
|
export const removeReaction = (statusId, name) => (dispatch, getState) => {
|
||||||
|
@ -461,19 +458,16 @@ export const removeReactionRequest = (statusId, name) => ({
|
||||||
type: REACTION_REMOVE_REQUEST,
|
type: REACTION_REMOVE_REQUEST,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const removeReactionSuccess = (statusId, name) => ({
|
export const removeReactionSuccess = (statusId, name) => ({
|
||||||
type: REACTION_REMOVE_SUCCESS,
|
type: REACTION_REMOVE_SUCCESS,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const removeReactionFail = (statusId, name) => ({
|
export const removeReactionFail = (statusId, name) => ({
|
||||||
type: REACTION_REMOVE_FAIL,
|
type: REACTION_REMOVE_FAIL,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import { reduceMotion } from '../initial_state';
|
import { autoPlayGif, reduceMotion } from '../initial_state';
|
||||||
import spring from 'react-motion/lib/spring';
|
import spring from 'react-motion/lib/spring';
|
||||||
import TransitionMotion from 'react-motion/lib/TransitionMotion';
|
import TransitionMotion from 'react-motion/lib/TransitionMotion';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
@ -9,7 +9,6 @@ import React from 'react';
|
||||||
import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
|
import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
|
||||||
import AnimatedNumber from './animated_number';
|
import AnimatedNumber from './animated_number';
|
||||||
import { assetHost } from '../utils/config';
|
import { assetHost } from '../utils/config';
|
||||||
import { autoPlayGif } from '../initial_state';
|
|
||||||
|
|
||||||
export default class StatusReactions extends ImmutablePureComponent {
|
export default class StatusReactions extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
@ -101,19 +100,12 @@ class Reaction extends ImmutablePureComponent {
|
||||||
render() {
|
render() {
|
||||||
const { reaction } = this.props;
|
const { reaction } = this.props;
|
||||||
|
|
||||||
let shortCode = reaction.get('name');
|
|
||||||
|
|
||||||
if (unicodeMapping[shortCode]) {
|
|
||||||
shortCode = unicodeMapping[shortCode].shortCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
className={classNames('reactions-bar__item', { active: reaction.get('me') })}
|
className={classNames('reactions-bar__item', { active: reaction.get('me') })}
|
||||||
onClick={this.handleClick}
|
onClick={this.handleClick}
|
||||||
onMouseEnter={this.handleMouseEnter}
|
onMouseEnter={this.handleMouseEnter}
|
||||||
onMouseLeave={this.handleMouseLeave}
|
onMouseLeave={this.handleMouseLeave}
|
||||||
title={`:${shortCode}:`}
|
|
||||||
style={this.props.style}
|
style={this.props.style}
|
||||||
>
|
>
|
||||||
<span className='reactions-bar__item__emoji'>
|
<span className='reactions-bar__item__emoji'>
|
||||||
|
|
|
@ -33,7 +33,6 @@ const messages = defineMessages({
|
||||||
unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
|
unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
|
||||||
private: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
|
private: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
|
||||||
direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
|
direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
|
||||||
enter_amount_prompt: { id: 'settings.enter_amount_prompt', defaultMessage: 'Enter an amount' },
|
|
||||||
});
|
});
|
||||||
|
|
||||||
class LocalSettingsPage extends React.PureComponent {
|
class LocalSettingsPage extends React.PureComponent {
|
||||||
|
|
|
@ -22,21 +22,20 @@ export default class LocalSettingsPageItem extends React.PureComponent {
|
||||||
})),
|
})),
|
||||||
settings: ImmutablePropTypes.map.isRequired,
|
settings: ImmutablePropTypes.map.isRequired,
|
||||||
placeholder: PropTypes.string,
|
placeholder: PropTypes.string,
|
||||||
number: PropTypes.bool,
|
|
||||||
disabled: PropTypes.bool,
|
disabled: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
handleChange = e => {
|
handleChange = e => {
|
||||||
const { target } = e;
|
const { target } = e;
|
||||||
const { item, onChange, options, placeholder, number } = this.props;
|
const { item, onChange, options, placeholder } = this.props;
|
||||||
if (options && options.length > 0) onChange(item, target.value);
|
if (options && options.length > 0) onChange(item, target.value);
|
||||||
else if (placeholder) onChange(item, number ? parseInt(target.value) : target.value);
|
else if (placeholder) onChange(item, target.value);
|
||||||
else onChange(item, target.checked);
|
else onChange(item, target.checked);
|
||||||
};
|
};
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { handleChange } = this;
|
const { handleChange } = this;
|
||||||
const { settings, item, id, inputProps, options, children, dependsOn, dependsOnNot, placeholder, number, disabled } = this.props;
|
const { settings, item, id, inputProps, options, children, dependsOn, dependsOnNot, placeholder, disabled } = this.props;
|
||||||
let enabled = !disabled;
|
let enabled = !disabled;
|
||||||
|
|
||||||
if (dependsOn) {
|
if (dependsOn) {
|
||||||
|
@ -80,7 +79,7 @@ export default class LocalSettingsPageItem extends React.PureComponent {
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
} else if (placeholder || number) {
|
} else if (placeholder) {
|
||||||
return (
|
return (
|
||||||
<div className='glitch local-settings__page__item string'>
|
<div className='glitch local-settings__page__item string'>
|
||||||
<label htmlFor={id}>
|
<label htmlFor={id}>
|
||||||
|
@ -88,7 +87,7 @@ export default class LocalSettingsPageItem extends React.PureComponent {
|
||||||
<p>
|
<p>
|
||||||
<input
|
<input
|
||||||
id={id}
|
id={id}
|
||||||
type={number ? 'number' : 'text'}
|
type='text'
|
||||||
value={settings.getIn(item)}
|
value={settings.getIn(item)}
|
||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
|
|
|
@ -20,7 +20,7 @@ import Icon from 'flavours/glitch/components/icon';
|
||||||
import AnimatedNumber from 'flavours/glitch/components/animated_number';
|
import AnimatedNumber from 'flavours/glitch/components/animated_number';
|
||||||
import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
|
import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
|
||||||
import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
|
import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
|
||||||
import StatusReactions from '../../../components/status_reactions';
|
import StatusReactions from 'flavours/glitch/components/status_reactions';
|
||||||
|
|
||||||
class DetailedStatus extends ImmutablePureComponent {
|
class DetailedStatus extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ import { initMuteModal } from 'flavours/glitch/actions/mutes';
|
||||||
import { initBlockModal } from 'flavours/glitch/actions/blocks';
|
import { initBlockModal } from 'flavours/glitch/actions/blocks';
|
||||||
import { initReport } from 'flavours/glitch/actions/reports';
|
import { initReport } from 'flavours/glitch/actions/reports';
|
||||||
import { initBoostModal } from 'flavours/glitch/actions/boosts';
|
import { initBoostModal } from 'flavours/glitch/actions/boosts';
|
||||||
import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
|
import { makeCustomEmojiMap, makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
|
||||||
import ScrollContainer from 'flavours/glitch/containers/scroll_container';
|
import ScrollContainer from 'flavours/glitch/containers/scroll_container';
|
||||||
import ColumnHeader from '../../components/column_header';
|
import ColumnHeader from '../../components/column_header';
|
||||||
import StatusContainer from 'flavours/glitch/containers/status_container';
|
import StatusContainer from 'flavours/glitch/containers/status_container';
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
* @property {boolean} limited_federation_mode
|
* @property {boolean} limited_federation_mode
|
||||||
* @property {string} locale
|
* @property {string} locale
|
||||||
* @property {string | null} mascot
|
* @property {string | null} mascot
|
||||||
|
* @property {number} max_reactions
|
||||||
* @property {string=} me
|
* @property {string=} me
|
||||||
* @property {string=} moved_to_account_id
|
* @property {string=} moved_to_account_id
|
||||||
* @property {string=} owner
|
* @property {string=} owner
|
||||||
|
@ -81,6 +82,7 @@
|
||||||
* @property {boolean} use_blurhash
|
* @property {boolean} use_blurhash
|
||||||
* @property {boolean=} use_pending_items
|
* @property {boolean=} use_pending_items
|
||||||
* @property {string} version
|
* @property {string} version
|
||||||
|
* @property {number} visible_reactions
|
||||||
* @property {boolean} translation_enabled
|
* @property {boolean} translation_enabled
|
||||||
* @property {string} status_page_url
|
* @property {string} status_page_url
|
||||||
* @property {boolean} system_emoji_font
|
* @property {boolean} system_emoji_font
|
||||||
|
@ -134,7 +136,6 @@ export const mascot = getMeta('mascot');
|
||||||
export const maxReactions = (initialState && initialState.max_reactions) || 1;
|
export const maxReactions = (initialState && initialState.max_reactions) || 1;
|
||||||
export const me = getMeta('me');
|
export const me = getMeta('me');
|
||||||
export const movedToAccountId = getMeta('moved_to_account_id');
|
export const movedToAccountId = getMeta('moved_to_account_id');
|
||||||
export const visibleReactions = getMeta('visible_reactions');
|
|
||||||
export const owner = getMeta('owner');
|
export const owner = getMeta('owner');
|
||||||
export const profile_directory = getMeta('profile_directory');
|
export const profile_directory = getMeta('profile_directory');
|
||||||
export const reduceMotion = getMeta('reduce_motion');
|
export const reduceMotion = getMeta('reduce_motion');
|
||||||
|
|
|
@ -449,14 +449,12 @@ export const addReactionRequest = (statusId, name) => ({
|
||||||
type: REACTION_ADD_REQUEST,
|
type: REACTION_ADD_REQUEST,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const addReactionSuccess = (statusId, name) => ({
|
export const addReactionSuccess = (statusId, name) => ({
|
||||||
type: REACTION_ADD_SUCCESS,
|
type: REACTION_ADD_SUCCESS,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const addReactionFail = (statusId, name, error) => ({
|
export const addReactionFail = (statusId, name, error) => ({
|
||||||
|
@ -464,7 +462,6 @@ export const addReactionFail = (statusId, name, error) => ({
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
error,
|
error,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const removeReaction = (statusId, name) => (dispatch, getState) => {
|
export const removeReaction = (statusId, name) => (dispatch, getState) => {
|
||||||
|
@ -481,19 +478,16 @@ export const removeReactionRequest = (statusId, name) => ({
|
||||||
type: REACTION_REMOVE_REQUEST,
|
type: REACTION_REMOVE_REQUEST,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const removeReactionSuccess = (statusId, name) => ({
|
export const removeReactionSuccess = (statusId, name) => ({
|
||||||
type: REACTION_REMOVE_SUCCESS,
|
type: REACTION_REMOVE_SUCCESS,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const removeReactionFail = (statusId, name) => ({
|
export const removeReactionFail = (statusId, name) => ({
|
||||||
type: REACTION_REMOVE_FAIL,
|
type: REACTION_REMOVE_FAIL,
|
||||||
id: statusId,
|
id: statusId,
|
||||||
name,
|
name,
|
||||||
skipLoading: true,
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -16,13 +16,12 @@ import { MediaGallery, Video, Audio } from '../features/ui/util/async-components
|
||||||
import { HotKeys } from 'react-hotkeys';
|
import { HotKeys } from 'react-hotkeys';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import Icon from 'mastodon/components/icon';
|
import Icon from 'mastodon/components/icon';
|
||||||
import { displayMedia } from '../initial_state';
|
import { displayMedia, visibleReactions } from '../initial_state';
|
||||||
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
|
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
|
||||||
|
|
||||||
// We use the component (and not the container) since we do not want
|
// We use the component (and not the container) since we do not want
|
||||||
// to use the progress bar to show download progress
|
// to use the progress bar to show download progress
|
||||||
import Bundle from '../features/ui/components/bundle';
|
import Bundle from '../features/ui/components/bundle';
|
||||||
import { visibleReactions } from '../initial_state';
|
|
||||||
|
|
||||||
export const textForScreenReader = (intl, status, rebloggedByText = false) => {
|
export const textForScreenReader = (intl, status, rebloggedByText = false) => {
|
||||||
const displayName = status.getIn(['account', 'display_name']);
|
const displayName = status.getIn(['account', 'display_name']);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import { reduceMotion } from '../initial_state';
|
import { autoPlayGif, reduceMotion } from '../initial_state';
|
||||||
import spring from 'react-motion/lib/spring';
|
import spring from 'react-motion/lib/spring';
|
||||||
import TransitionMotion from 'react-motion/lib/TransitionMotion';
|
import TransitionMotion from 'react-motion/lib/TransitionMotion';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
@ -9,7 +9,6 @@ import React from 'react';
|
||||||
import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
|
import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
|
||||||
import AnimatedNumber from './animated_number';
|
import AnimatedNumber from './animated_number';
|
||||||
import { assetHost } from '../utils/config';
|
import { assetHost } from '../utils/config';
|
||||||
import { autoPlayGif } from '../initial_state';
|
|
||||||
|
|
||||||
export default class StatusReactions extends ImmutablePureComponent {
|
export default class StatusReactions extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
@ -101,19 +100,12 @@ class Reaction extends ImmutablePureComponent {
|
||||||
render() {
|
render() {
|
||||||
const { reaction } = this.props;
|
const { reaction } = this.props;
|
||||||
|
|
||||||
let shortCode = reaction.get('name');
|
|
||||||
|
|
||||||
if (unicodeMapping[shortCode]) {
|
|
||||||
shortCode = unicodeMapping[shortCode].shortCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
className={classNames('reactions-bar__item', { active: reaction.get('me') })}
|
className={classNames('reactions-bar__item', { active: reaction.get('me') })}
|
||||||
onClick={this.handleClick}
|
onClick={this.handleClick}
|
||||||
onMouseEnter={this.handleMouseEnter}
|
onMouseEnter={this.handleMouseEnter}
|
||||||
onMouseLeave={this.handleMouseLeave}
|
onMouseLeave={this.handleMouseLeave}
|
||||||
title={`:${shortCode}:`}
|
|
||||||
style={this.props.style}
|
style={this.props.style}
|
||||||
>
|
>
|
||||||
<span className='reactions-bar__item__emoji'>
|
<span className='reactions-bar__item__emoji'>
|
||||||
|
|
|
@ -17,7 +17,7 @@ import Icon from 'mastodon/components/icon';
|
||||||
import AnimatedNumber from 'mastodon/components/animated_number';
|
import AnimatedNumber from 'mastodon/components/animated_number';
|
||||||
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
|
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
|
||||||
import EditedTimestamp from 'mastodon/components/edited_timestamp';
|
import EditedTimestamp from 'mastodon/components/edited_timestamp';
|
||||||
import StatusReactions from '../../../components/status_reactions';
|
import StatusReactions from 'mastodon/components/status_reactions';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
|
public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
|
||||||
|
|
|
@ -49,7 +49,7 @@ import { initMuteModal } from '../../actions/mutes';
|
||||||
import { initBlockModal } from '../../actions/blocks';
|
import { initBlockModal } from '../../actions/blocks';
|
||||||
import { initBoostModal } from '../../actions/boosts';
|
import { initBoostModal } from '../../actions/boosts';
|
||||||
import { initReport } from '../../actions/reports';
|
import { initReport } from '../../actions/reports';
|
||||||
import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
|
import { makeCustomEmojiMap, makeGetStatus, makeGetPictureInPicture } from '../../selectors';
|
||||||
import ScrollContainer from 'mastodon/containers/scroll_container';
|
import ScrollContainer from 'mastodon/containers/scroll_container';
|
||||||
import ColumnHeader from '../../components/column_header';
|
import ColumnHeader from '../../components/column_header';
|
||||||
import StatusContainer from '../../containers/status_container';
|
import StatusContainer from '../../containers/status_container';
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
* @property {boolean} limited_federation_mode
|
* @property {boolean} limited_federation_mode
|
||||||
* @property {string} locale
|
* @property {string} locale
|
||||||
* @property {string | null} mascot
|
* @property {string | null} mascot
|
||||||
|
* @property {number} max_reactions
|
||||||
* @property {string=} me
|
* @property {string=} me
|
||||||
* @property {string=} moved_to_account_id
|
* @property {string=} moved_to_account_id
|
||||||
* @property {string=} owner
|
* @property {string=} owner
|
||||||
|
@ -117,7 +118,6 @@ export const mascot = getMeta('mascot');
|
||||||
export const maxReactions = (initialState && initialState.max_reactions) || 1;
|
export const maxReactions = (initialState && initialState.max_reactions) || 1;
|
||||||
export const me = getMeta('me');
|
export const me = getMeta('me');
|
||||||
export const movedToAccountId = getMeta('moved_to_account_id');
|
export const movedToAccountId = getMeta('moved_to_account_id');
|
||||||
export const visibleReactions = getMeta('visible_reactions');
|
|
||||||
export const owner = getMeta('owner');
|
export const owner = getMeta('owner');
|
||||||
export const profile_directory = getMeta('profile_directory');
|
export const profile_directory = getMeta('profile_directory');
|
||||||
export const reduceMotion = getMeta('reduce_motion');
|
export const reduceMotion = getMeta('reduce_motion');
|
||||||
|
|
Loading…
Reference in a new issue