aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #607 from wvds/GH-446

Browse source 
Remove focus after cancelling modal
This commit is contained in:
Yuya Ochiai 2017-10-07 22:10:14 +09:00 committed by GitHub
parent 5307341086 e23b0d21ab
commit 85a1b34081
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -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.

1
src/browser/components/SettingsPage.jsx
View file

@ -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({

2
src/browser/components/TeamList.jsx
View file

@ -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);
} }