Merge pull request #607 from wvds/GH-446
Remove focus after cancelling modal
This commit is contained in:
commit
85a1b34081
|
@ -25,6 +25,8 @@ Release date: TBD
|
||||||
[#573](https://github.com/mattermost/desktop/issues/573)
|
[#573](https://github.com/mattermost/desktop/issues/573)
|
||||||
- Fixed file upload dialogs did not allow any file to be selected.
|
- Fixed file upload dialogs did not allow any file to be selected.
|
||||||
[#497](https://github.com/mattermost/desktop/issues/497)
|
[#497](https://github.com/mattermost/desktop/issues/497)
|
||||||
|
- Fixed an issue where unnecessary focus remains after closing dialogs on the settings page.
|
||||||
|
[#446](https://github.com/mattermost/desktop/issues/446)
|
||||||
|
|
||||||
#### Windows
|
#### Windows
|
||||||
- Fixed desktop notifications not working when the window has been minimized from inactive state.
|
- Fixed desktop notifications not working when the window has been minimized from inactive state.
|
||||||
|
|
|
@ -191,6 +191,7 @@ const SettingsPage = createReactClass({
|
||||||
this.setState({
|
this.setState({
|
||||||
showAddTeamForm: !this.state.showAddTeamForm
|
showAddTeamForm: !this.state.showAddTeamForm
|
||||||
});
|
});
|
||||||
|
document.activeElement.blur();
|
||||||
},
|
},
|
||||||
setShowTeamFormVisibility(val) {
|
setShowTeamFormVisibility(val) {
|
||||||
this.setState({
|
this.setState({
|
||||||
|
|
|
@ -80,10 +80,12 @@ const TeamList = createReactClass({
|
||||||
var self = this;
|
var self = this;
|
||||||
var teamNodes = this.props.teams.map((team, i) => {
|
var teamNodes = this.props.teams.map((team, i) => {
|
||||||
function handleTeamRemove() {
|
function handleTeamRemove() {
|
||||||
|
document.activeElement.blur();
|
||||||
self.openServerRemoveModal(i);
|
self.openServerRemoveModal(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleTeamEditing() {
|
function handleTeamEditing() {
|
||||||
|
document.activeElement.blur();
|
||||||
self.handleTeamEditing(team.name, team.url, i);
|
self.handleTeamEditing(team.name, team.url, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue