matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into audio-player

Browse Source
This commit is contained in:
Alex Gleason
2020-07-02 16:32:50 -05:00
parent 3be1c9a1f1 e965c74760
commit 4e94c5d2ca
76 changed files with 392 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/compose/components/emoji_picker_dropdown.js
View File

@ -56,7 +56,7 @@ class ModifierPickerMenu extends React.PureComponent {
this.props.onSelect(e.currentTarget.getAttribute('data-index') * 1);
}
componentWillReceiveProps(nextProps) {
componentDidUpdate(nextProps) {
if (nextProps.active) {
this.attachListeners();
} else {

23
app/soapbox/features/compose/components/privacy_dropdown.js
View File

@ -168,6 +168,18 @@ class PrivacyDropdown extends React.PureComponent {
placement: 'bottom',
};
constructor(props) {
super(props);
const { intl: { formatMessage } } = this.props;
this.options = [
{ icon: 'globe', value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
{ icon: 'unlock', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
{ icon: 'lock', value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
{ icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
];
}
handleToggle = ({ target }) => {
if (this.props.isUserTouching()) {
if (this.state.open) {
@ -210,17 +222,6 @@ class PrivacyDropdown extends React.PureComponent {
this.props.onChange(value);
}
componentWillMount() {
const { intl: { formatMessage } } = this.props;
this.options = [
{ icon: 'globe', value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
{ icon: 'unlock', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
{ icon: 'lock', value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
{ icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
];
}
render() {
const { value, intl } = this.props;
const { open, placement } = this.state;