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

Revert "Show error dialog when wrong buildConfig is used"

Browse source 
This reverts commit fa578fb37c.
This commit is contained in:
Yuya Ochiai 2017-11-09 00:35:05 +09:00
parent f7a9f50764
commit 45963a9eb1
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/config/buildConfig.js
View file

@ -6,7 +6,6 @@
* @prop {string} helpLink - The URL for "Help->Learn More..." menu item.
* If null is specified, the menu disappears.
* @prop {boolean} enableServerManagement - Whether users can edit servers configuration.
* If false is specified, defaultTeams must have a team at least.
*/
const buildConfig = {
defaultTeams: [/*

9
src/main.js
View file

@ -31,7 +31,6 @@ if (squirrelStartup()) {
}
var settings = require('./common/settings');
const buildConfig = require('./common/config/buildConfig');
var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json'));
const {createMainWindow} = require('./main/mainWindow');
const appMenu = require('./main/menus/app');
@ -368,14 +367,6 @@ app.on('ready', () => {
if (global.willAppQuit) {
return;
}
if (buildConfig.enableServerManagement === false && buildConfig.defaultTeams.length === 0) {
dialog.showMessageBox({
type: 'error',
title: 'Mattermost',
message: 'When "enableServerManagement: false" is specified in buildConfig.js,\n"defaultTeams" must have one team at least.'
});
app.exit();
}
if (global.isDev) {
installExtension.default(installExtension.REACT_DEVELOPER_TOOLS).
then((name) => console.log(`Added Extension: ${name}`)).