phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix for failed tests

Browse Source
This commit is contained in:
Yuya Ochiai
2015-12-23 19:25:14 +09:00
parent d010d09ef4
commit 62b6e4c51b
4 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/browser/index.jsx
View File

@@ -166,13 +166,17 @@ var MattermostView = React.createClass({
// 'disablewebsecurity' is necessary to display external images.
// However, it allows also CSS/JavaScript.
// So webview should use 'allowDisplayingInsecureContent' as same as BrowserWindow.
return (<webview style={ this.props.style } preload="webview/mattermost.js" src={ this.props.src } ref="webview"></webview>);
return (<webview className="mattermostView" style={ this.props.style } preload="webview/mattermost.js" src={ this.props.src } ref="webview"></webview>);
}
});
var configFile = remote.getGlobal('config-file');
var config = settings.readFileSync(configFile);
var config;
try {
var configFile = remote.getGlobal('config-file');
config = settings.readFileSync(configFile);
} catch (e) {
window.location = 'settings.html';
}
var contextMenu = require('./menus/context');
var menu = contextMenu.createDefault();