Merge branch 'main' into use_http_client_2
This commit is contained in:
commit
0966b2b471
4 changed files with 17 additions and 2 deletions
|
@ -16,6 +16,7 @@ interface LanguageSelectProps {
|
|||
showSite?: boolean;
|
||||
iconVersion?: boolean;
|
||||
disabled?: boolean;
|
||||
showLanguageWarning?: boolean;
|
||||
}
|
||||
|
||||
export class LanguageSelect extends Component<LanguageSelectProps, any> {
|
||||
|
@ -49,7 +50,7 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
|
|||
this.selectBtn
|
||||
) : (
|
||||
<div>
|
||||
{this.props.multiple && (
|
||||
{this.props.multiple && this.props.showLanguageWarning && (
|
||||
<div className="alert alert-warning" role="alert">
|
||||
{i18n.t("undetermined_language_warning")}
|
||||
</div>
|
||||
|
|
|
@ -147,6 +147,7 @@ export class MarkdownTextArea extends Component<
|
|||
value={this.state.content}
|
||||
onInput={linkEvent(this, this.handleContentChange)}
|
||||
onPaste={linkEvent(this, this.handleImageUploadPaste)}
|
||||
onKeyDown={linkEvent(this, this.handleKeyBinds)}
|
||||
required
|
||||
disabled={this.isDisabled}
|
||||
rows={2}
|
||||
|
@ -428,6 +429,18 @@ export class MarkdownTextArea extends Component<
|
|||
i.contentChange();
|
||||
}
|
||||
|
||||
// Keybind handler
|
||||
handleKeyBinds(i: MarkdownTextArea, event: KeyboardEvent) {
|
||||
if (event.ctrlKey) {
|
||||
switch (event.key) {
|
||||
case "k": {
|
||||
// Currently only one case but will support further keybinds
|
||||
i.handleInsertLink(i, event);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
handlePreviewToggle(i: MarkdownTextArea, event: any) {
|
||||
event.preventDefault();
|
||||
i.setState({ previewMode: !i.state.previewMode });
|
||||
|
|
|
@ -387,7 +387,7 @@ export class Profile extends Component<
|
|||
{this.getRadio(PersonDetailsView.Overview)}
|
||||
{this.getRadio(PersonDetailsView.Comments)}
|
||||
{this.getRadio(PersonDetailsView.Posts)}
|
||||
{this.getRadio(PersonDetailsView.Saved)}
|
||||
{this.amCurrentUser && this.getRadio(PersonDetailsView.Saved)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -591,6 +591,7 @@ export class Settings extends Component<any, SettingsState> {
|
|||
siteLanguages={this.state.siteRes.discussion_languages}
|
||||
selectedLanguageIds={selectedLangs}
|
||||
multiple={true}
|
||||
showLanguageWarning={true}
|
||||
showSite
|
||||
onChange={this.handleDiscussionLanguageChange}
|
||||
/>
|
||||
|
|
Loading…
Reference in a new issue