Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: #194 日本語入力ができない問題についての一時的な回避 #195

Closed
wants to merge 5 commits into from
Closed

Fix: #194 日本語入力ができない問題についての一時的な回避 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
175d10f
Fix: #194 日本語入力ができない問題についての一時的な回避
kmycode Oct 28, 2023
b6e51e9
Fix: 別の解決策
kmycode Oct 28, 2023
5814d7f
不要な変更を削除
kmycode Oct 28, 2023
13f4901
スペース消して
kmycode Oct 28, 2023
db628e4
Fix: 詳細画面のリンク、ブクマ分類のリンク、アイコン
kmycode Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/javascript/mastodon/features/bookmark_categories/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class BookmarkCategories extends ImmutablePureComponent {
bindToDocument={!multiColumn}
>
{categories.map(category =>
<ColumnLink key={category.get('id')} to={`/boozkmark_categories/${category.get('id')}`} icon='bookmark' iconComponent={BookmarkIcon} text={category.get('title')} />,
<ColumnLink key={category.get('id')} to={`/bookmark_categories/${category.get('id')}`} icon='bookmark' iconComponent={BookmarkIcon} text={category.get('title')} />,
)}
</ScrollableList>

Expand Down
12 changes: 5 additions & 7 deletions app/javascript/mastodon/features/compose/components/compose_form.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,11 @@ class ComposeForm extends ImmutablePureComponent {
onPaste={onPaste}
autoFocus={autoFocus}
lang={this.props.lang}
>

<div className='compose-form__modifiers'>
<UploadFormContainer />
<PollFormContainer />
</div>
</AutosuggestTextarea>
/>
<div className='compose-form__modifiers'>
<UploadFormContainer />
<PollFormContainer />
</div>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
<ExpirationDropdownContainer onPickExpiration={this.handleExpirationPick} />

Expand Down
4 changes: 3 additions & 1 deletion app/javascript/mastodon/features/emoji_reactions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';

import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
import { debounce } from 'lodash';

import { fetchEmojiReactions, expandEmojiReactions } from 'mastodon/actions/interactions';
Expand All @@ -18,6 +19,7 @@ import AccountContainer from 'mastodon/containers/account_container';
import Column from 'mastodon/features/ui/components/column';



import EmojiView from '../../components/emoji_view';
import { LoadingIndicator } from '../../components/loading_indicator';

Expand Down Expand Up @@ -86,7 +88,7 @@ class EmojiReactions extends ImmutablePureComponent {
showBackButton
multiColumn={multiColumn}
extraButton={(
<button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
<button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' icon={RefreshIcon} /></button>
)}
/>

Expand Down
4 changes: 2 additions & 2 deletions app/javascript/mastodon/features/status/components/detailed_status.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class DetailedStatus extends ImmutablePureComponent {
);
}

if (this.context.router) {
if (this.props.history) {
emojiReactionsLink = (
<Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/emoji_reactions`} className='detailed-status__link'>
<Icon id='smile-o' icon={EmojiReactionIcon} />
Expand All @@ -313,7 +313,7 @@ class DetailedStatus extends ImmutablePureComponent {
);
}

if (this.context.router) {
if (this.props.history) {
statusReferencesLink = (
<Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/references`} className='detailed-status__link'>
<Icon id='link' icon={ReferenceIcon} />
Expand Down
5 changes: 4 additions & 1 deletion app/javascript/mastodon/features/status_references/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';

import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';

import { fetchStatusReferences } from 'mastodon/actions/interactions';
import ColumnHeader from 'mastodon/components/column_header';
import { Icon } from 'mastodon/components/icon';
Expand All @@ -16,6 +18,7 @@ import ScrollableList from 'mastodon/components/scrollable_list';
import StatusContainer from 'mastodon/containers/status_container';
import Column from 'mastodon/features/ui/components/column';


const messages = defineMessages({
refresh: { id: 'refresh', defaultMessage: 'Refresh' },
});
Expand Down Expand Up @@ -69,7 +72,7 @@ class StatusReferences extends ImmutablePureComponent {
showBackButton
multiColumn={multiColumn}
extraButton={(
<button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
<button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' icon={RefreshIcon} /></button>
)}
/>

Expand Down
Loading