PLT-5156 Fix Channel Switcher Console Errors. (#5058)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
1fc26a152f
Коммит
97a51b0e31
@@ -64,6 +64,7 @@ export default class SwitchChannelModal extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onExited() {
|
onExited() {
|
||||||
|
this.selected = null;
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
$('#post_textbox').get(0).focus();
|
$('#post_textbox').get(0).focus();
|
||||||
});
|
});
|
||||||
@@ -71,6 +72,7 @@ export default class SwitchChannelModal extends React.Component {
|
|||||||
|
|
||||||
onChange(e) {
|
onChange(e) {
|
||||||
this.setState({text: e.target.value});
|
this.setState({text: e.target.value});
|
||||||
|
this.selected = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
onItemSelected(item) {
|
onItemSelected(item) {
|
||||||
@@ -89,6 +91,15 @@ export default class SwitchChannelModal extends React.Component {
|
|||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
let channel = null;
|
let channel = null;
|
||||||
|
|
||||||
|
if (!this.selected) {
|
||||||
|
if (this.state.text !== '') {
|
||||||
|
this.setState({
|
||||||
|
error: Utils.localizeMessage('channel_switch_modal.not_found', 'No matches found.')
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.selected.type === Constants.DM_CHANNEL) {
|
if (this.selected.type === Constants.DM_CHANNEL) {
|
||||||
const user = UserStore.getProfileByUsername(this.selected.name);
|
const user = UserStore.getProfileByUsername(this.selected.name);
|
||||||
|
|
||||||
@@ -117,7 +128,7 @@ export default class SwitchChannelModal extends React.Component {
|
|||||||
this.onHide();
|
this.onHide();
|
||||||
} else if (this.state.text !== '') {
|
} else if (this.state.text !== '') {
|
||||||
this.setState({
|
this.setState({
|
||||||
error: Utils.localizeMessage('channel_switch_modal.not_found', 'No matches found.')
|
error: Utils.localizeMessage('channel_switch_modal.failed_to_open', 'Failed to open channel.')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1120,6 +1120,7 @@
|
|||||||
"channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.",
|
"channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.",
|
||||||
"channel_select.placeholder": "--- Select a channel ---",
|
"channel_select.placeholder": "--- Select a channel ---",
|
||||||
"channel_switch_modal.dm": "(Direct Message)",
|
"channel_switch_modal.dm": "(Direct Message)",
|
||||||
|
"channel_switch_modal.failed_to_open": "Failed to open channel.",
|
||||||
"channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
|
"channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
|
||||||
"channel_switch_modal.not_found": "No matches found.",
|
"channel_switch_modal.not_found": "No matches found.",
|
||||||
"channel_switch_modal.submit": "Switch",
|
"channel_switch_modal.submit": "Switch",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user