Merge remote-tracking branch 'mattermost/master' into auto-updater

This commit is contained in:
Yuya Ochiai
2018-10-16 00:28:47 +09:00
31 changed files with 888 additions and 447 deletions

View File

@@ -15,11 +15,11 @@ function createTemplate(mainWindow, config, isDev) {
type: 'separator',
};
var appName = app.getName();
var firstMenuName = (process.platform === 'darwin') ? appName : 'File';
var template = [];
const appName = app.getName();
const firstMenuName = (process.platform === 'darwin') ? appName : 'File';
const template = [];
var platformAppMenu = process.platform === 'darwin' ? [{
let platformAppMenu = process.platform === 'darwin' ? [{
label: 'About ' + appName,
role: 'about',
click() {
@@ -217,7 +217,7 @@ function createTemplate(mainWindow, config, isDev) {
}],
};
template.push(windowMenu);
var submenu = [];
const submenu = [];
if (buildConfig.helpLink) {
submenu.push({
label: 'Learn More...',