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

Reload the tab after 30 sec when failed to load

Browse source 
Close #127
This commit is contained in:
Yuya Ochiai 2016-06-13 23:55:26 +09:00
parent f2e3b58e04
commit de5e6cf2ca
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/browser/index.jsx
View file

@ -286,7 +286,7 @@ var TabBar = React.createClass({
var MattermostView = React.createClass({ var MattermostView = React.createClass({
getInitialState: function() { getInitialState: function() {
return { return {
did_fail_load: null errorInfo: null
}; };
}, },
handleUnreadCountChange: function(unreadCount, mentionCount, isUnread, isMentioned) { handleUnreadCountChange: function(unreadCount, mentionCount, isUnread, isMentioned) {
@ -317,8 +317,14 @@ var MattermostView = React.createClass({
icon: '../resources/appicon.png' icon: '../resources/appicon.png'
}); });
thisObj.setState({ thisObj.setState({
did_fail_load: e errorInfo: e
}); });
setTimeout(() => {
thisObj.setState({
errorInfo: null
});
webview.reload();
}, 30000);
}); });
// Open link in browserWindow. for exmaple, attached files. // Open link in browserWindow. for exmaple, attached files.
@ -403,14 +409,16 @@ var MattermostView = React.createClass({
}); });
}, },
render: function() { render: function() {
const errorView = this.state.errorInfo ? (<ErrorView id={ this.props.id + '-fail' } style={ this.props.style } className="errorView" errorInfo={ this.state.errorInfo }></ErrorView>) : null;
// 'disablewebsecurity' is necessary to display external images. // 'disablewebsecurity' is necessary to display external images.
// However, it allows also CSS/JavaScript. // However, it allows also CSS/JavaScript.
// So webview should use 'allowDisplayingInsecureContent' as same as BrowserWindow. // So webview should use 'allowDisplayingInsecureContent' as same as BrowserWindow.
if (this.state.did_fail_load === null) {
return (<webview id={ this.props.id } className="mattermostView" style={ this.props.style } preload="webview/mattermost.js" src={ this.props.src } ref="webview"></webview>); // Need to keep webview mounted when failed to load.
} else { return (<div>
return (<ErrorView id={ this.props.id + '-fail' } className="errorView" errorInfo={ this.state.did_fail_load } style={ this.props.style }></ErrorView>) { errorView }
} <webview id={ this.props.id } className="mattermostView" style={ this.props.style } preload="webview/mattermost.js" src={ this.props.src } ref="webview"></webview>
</div>);
} }
}); });