tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
This commit is contained in:
Thibaut Girka
2018-06-15 20:51:39 +02:00
parent afceef74c2 0df91c7b1e
commit db200226b8
32 changed files with 245 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,9 +128,7 @@ export default class ComposeForm extends ImmutablePureComponent {
this.autosuggestTextarea.textarea.focus();
} else if(prevProps.is_submitting && !this.props.is_submitting) {
this.autosuggestTextarea.textarea.focus();
}
if (this.props.spoiler !== prevProps.spoiler) {
} else if (this.props.spoiler !== prevProps.spoiler) {
if (this.props.spoiler) {
this.spoilerText.focus();
} else {