gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Change: #742 スマホで引用・参照をおこなったとき、投稿画面へ遷移するよう変更 (#763)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-06-24 12:18:57 +09:00 • committed by GitHub
parent e8dfef4bd4
commit f7d978b7e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/actions/compose.js
View file

@ -817,12 +817,16 @@ export function insertFeaturedTagCompose(position, data) {
}; };
} }
export function insertReferenceCompose(position, url, attributeType) { export function insertReferenceCompose(position, url, attributeType, routerHistory) {
return { return (dispatch, getState) => {
dispatch({
type: COMPOSE_REFERENCE_INSERT, type: COMPOSE_REFERENCE_INSERT,
position, position,
url, url,
attributeType, attributeType,
});
ensureComposeIsVisible(getState, routerHistory);
}; };
} }

4
app/javascript/mastodon/components/status_action_bar.jsx
View file

@ -290,11 +290,11 @@ class StatusActionBar extends ImmutablePureComponent {
}; };
handleReference = () => { handleReference = () => {
this.props.onReference(this.props.status); this.props.onReference(this.props.status, this.props.history);
}; };
handleQuote = () => { handleQuote = () => {
this.props.onQuote(this.props.status); this.props.onQuote(this.props.status, this.props.history);
}; };
handleHideClick = () => { handleHideClick = () => {

8
app/javascript/mastodon/containers/status_container.jsx
View file

@ -203,12 +203,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
}); });
}, },
onReference (status) { onReference (status, router) {
dispatch(insertReferenceCompose(0, status.get('url'), 'BT')); dispatch(insertReferenceCompose(0, status.get('url'), 'BT', router));
}, },
onQuote (status) { onQuote (status, router) {
dispatch(insertReferenceCompose(0, status.get('url'), 'QT')); dispatch(insertReferenceCompose(0, status.get('url'), 'QT', router));
}, },
onTranslate (status) { onTranslate (status) {

4
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -225,11 +225,11 @@ class ActionBar extends PureComponent {
}; };
handleReference = () => { handleReference = () => {
this.props.onReference(this.props.status); this.props.onReference(this.props.status, this.props.history);
}; };
handleQuote = () => { handleQuote = () => {
this.props.onQuote(this.props.status); this.props.onQuote(this.props.status, this.props.history);
}; };
handleEmojiPick = (data) => { handleEmojiPick = (data) => {

8
app/javascript/mastodon/features/status/index.jsx
View file

@ -368,12 +368,12 @@ class Status extends ImmutablePureComponent {
this.handleReblogClick(status, e, true); this.handleReblogClick(status, e, true);
}; };
handleReference = (status) => { handleReference = (status, router) => {
this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'BT')); this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'BT', router));
}; };
handleQuote = (status) => { handleQuote = (status, router) => {
this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'QT')); this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'QT', router));
}; };
handleBookmarkClick = (status) => { handleBookmarkClick = (status) => {