mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

[Glitch] Spelling 

Port front-end changes from b5329e0035 to glitch-soc

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Josh Soref 2022-03-06 16:51:40 -05:00 committed by Claire
parent 1fbd1fa5c4
commit 69a4f17988
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/scrollable_list.js
View File

@ -144,7 +144,7 @@ class ScrollableList extends PureComponent {
this.attachIntersectionObserver(); this.attachIntersectionObserver();
attachFullscreenListener(this.onFullScreenChange); attachFullscreenListener(this.onFullScreenChange);
// Handle initial scroll posiiton // Handle initial scroll position
this.handleScroll(); this.handleScroll();
} }

4
app/javascript/flavours/glitch/containers/media_container.js
View File

@ -43,7 +43,7 @@ export default class MediaContainer extends PureComponent {
handleOpenVideo = (options) => { handleOpenVideo = (options) => {
const { components } = this.props; const { components } = this.props;
const { media } = JSON.parse(components[options.componetIndex].getAttribute('data-props')); const { media } = JSON.parse(components[options.componentIndex].getAttribute('data-props'));
const mediaList = fromJS(media); const mediaList = fromJS(media);
document.body.classList.add('with-modals--active'); document.body.classList.add('with-modals--active');
@ -87,7 +87,7 @@ export default class MediaContainer extends PureComponent {
...(hashtag ? { hashtag: fromJS(hashtag) } : {}), ...(hashtag ? { hashtag: fromJS(hashtag) } : {}),
...(componentName === 'Video' ? { ...(componentName === 'Video' ? {
componetIndex: i, componentIndex: i,
onOpenVideo: this.handleOpenVideo, onOpenVideo: this.handleOpenVideo,
} : { } : {
onOpenMedia: this.handleOpenMedia, onOpenMedia: this.handleOpenMedia,

2
app/javascript/flavours/glitch/features/report/category.js
View File

@ -8,7 +8,7 @@ const messages = defineMessages({
dislike: { id: 'report.reasons.dislike', defaultMessage: 'I don\'t like it' }, dislike: { id: 'report.reasons.dislike', defaultMessage: 'I don\'t like it' },
dislike_description: { id: 'report.reasons.dislike_description', defaultMessage: 'It is not something you want to see' }, dislike_description: { id: 'report.reasons.dislike_description', defaultMessage: 'It is not something you want to see' },
spam: { id: 'report.reasons.spam', defaultMessage: 'It\'s spam' }, spam: { id: 'report.reasons.spam', defaultMessage: 'It\'s spam' },
spam_description: { id: 'report.reasons.spam_description', defaultMessage: 'Malicious links, fake engagement, or repetetive replies' }, spam_description: { id: 'report.reasons.spam_description', defaultMessage: 'Malicious links, fake engagement, or repetitive replies' },
violation: { id: 'report.reasons.violation', defaultMessage: 'It violates server rules' }, violation: { id: 'report.reasons.violation', defaultMessage: 'It violates server rules' },
violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' }, violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' },
other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' }, other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' },

4
app/javascript/flavours/glitch/features/video/index.js
View File

@ -123,7 +123,7 @@ class Video extends React.PureComponent {
autoPlay: PropTypes.bool, autoPlay: PropTypes.bool,
volume: PropTypes.number, volume: PropTypes.number,
muted: PropTypes.bool, muted: PropTypes.bool,
componetIndex: PropTypes.number, componentIndex: PropTypes.number,
}; };
static defaultProps = { static defaultProps = {
@ -516,7 +516,7 @@ class Video extends React.PureComponent {
startTime: this.video.currentTime, startTime: this.video.currentTime,
autoPlay: !this.state.paused, autoPlay: !this.state.paused,
defaultVolume: this.state.volume, defaultVolume: this.state.volume,
componetIndex: this.props.componetIndex, componentIndex: this.props.componentIndex,
}); });
} }

2
app/javascript/flavours/glitch/styles/polls.scss
View File

@ -75,7 +75,7 @@
display: none; display: none;
} }
.autossugest-input { .autosuggest-input {
flex: 1 1 auto; flex: 1 1 auto;
} }