logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 07b44278650cede72269ba923051e14f70fd16de
parent: a8deb6648bc348e64469cc3451040b46ea057b77
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed, 13 Dec 2017 20:17:37 +0900

Set direction style to reply indicator (#6006)


Diffstat:

Mapp/javascript/mastodon/features/compose/components/reply_indicator.js8++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js @@ -6,6 +6,7 @@ import IconButton from '../../../components/icon_button'; import DisplayName from '../../../components/display_name'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import { isRtl } from '../../../rtl'; const messages = defineMessages({ cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' }, @@ -42,7 +43,10 @@ export default class ReplyIndicator extends ImmutablePureComponent { return null; } - const content = { __html: status.get('contentHtml') }; + const content = { __html: status.get('contentHtml') }; + const style = { + direction: isRtl(status.get('search_index')) ? 'rtl' : 'ltr', + }; return ( <div className='reply-indicator'> @@ -55,7 +59,7 @@ export default class ReplyIndicator extends ImmutablePureComponent { </a> </div> - <div className='reply-indicator__content' dangerouslySetInnerHTML={content} /> + <div className='reply-indicator__content' style={style} dangerouslySetInnerHTML={content} /> </div> ); }