diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 20:09:05 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 20:09:05 +0200 |
| commit | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (patch) | |
| tree | c8048db1bc718663c5ed33c8b225544d5e37f98b | |
| parent | fc6d27daf39ca136b0e3e09e7572c5c46086ad72 (diff) | |
| parent | 5bcd98172c2d0ec4827e396a3648eb1e94634c55 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
| -rw-r--r-- | app/javascript/mastodon/components/status.js | 5 | ||||
| -rw-r--r-- | app/views/settings/preferences/other/show.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index a795b8ce9..aa5e870dc 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -171,6 +171,11 @@ class Status extends ImmutablePureComponent { } handleExpandClick = (e) => { + if (this.props.onClick) { + this.props.onClick(); + return; + } + if (e.button === 0) { if (!this.context.router) { return; diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index dfbf2a09c..9bdcb368d 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('settings.preferences') -= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| += simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f| = render 'shared/error_messages', object: current_user .fields-group |