Merge branch 'release-3.4'

This commit is contained in:
Yuya Ochiai
2016-10-04 00:10:06 +09:00
3 changed files with 6 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
{ {
"name": "mattermost", "name": "mattermost",
"productName": "Mattermost", "productName": "Mattermost",
"version": "3.4.0", "version": "3.4.1",
"description": "Mattermost Desktop application for Windows, Mac and Linux", "description": "Mattermost Desktop application for Windows, Mac and Linux",
"main": "main.js", "main": "main.js",
"author": { "author": {

View File

@@ -113,8 +113,10 @@ var MainPage = React.createClass({
} }
}); });
}, },
componentDidUpdate: function() { componentDidUpdate: function(prevProps, prevState) {
this.refs[`mattermostView${this.state.key}`].focusOnWebView(); if (prevState.key !== this.state.key) { // i.e. When tab has been changed
this.refs[`mattermostView${this.state.key}`].focusOnWebView();
}
}, },
handleSelect: function(key) { handleSelect: function(key) {
const newKey = (this.props.teams.length + key) % this.props.teams.length; const newKey = (this.props.teams.length + key) % this.props.teams.length;

View File

@@ -2,7 +2,7 @@
"name": "mattermost", "name": "mattermost",
"productName": "Mattermost", "productName": "Mattermost",
"desktopName": "Mattermost.desktop", "desktopName": "Mattermost.desktop",
"version": "3.4.0", "version": "3.4.1",
"description": "Mattermost Desktop application for Windows, Mac and Linux", "description": "Mattermost Desktop application for Windows, Mac and Linux",
"main": "main.js", "main": "main.js",
"author": { "author": {