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

Merge pull request #599 from csduarte/BASH-19

Browse source 
BASH-19 Remove hardcoded product name references
This commit is contained in:
Yuya Ochiai 2017-09-15 21:23:15 +09:00 committed by GitHub
parent 50cce7daa8 eb4b9a5529
commit 0826190538
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/browser/components/SettingsPage.jsx
View file

@ -14,7 +14,7 @@ const TeamList = require('./TeamList.jsx');
const AutoSaveIndicator = require('./AutoSaveIndicator.jsx'); const AutoSaveIndicator = require('./AutoSaveIndicator.jsx');
const appLauncher = new AutoLaunch({ const appLauncher = new AutoLaunch({
name: 'Mattermost', name: remote.app.getName(),
isHidden: true isHidden: true
}); });

5
src/browser/settings.jsx
View file

@ -1,11 +1,10 @@
'use strict'; 'use strict';
const {remote} = require('electron');
window.eval = global.eval = () => { window.eval = global.eval = () => {
throw new Error('Sorry, Mattermost does not support window.eval() for security reasons.'); throw new Error(`Sorry, ${remote.app.getName()} does not support window.eval() for security reasons.`);
}; };
const {remote} = require('electron');
const React = require('react'); const React = require('react');
const ReactDOM = require('react-dom'); const ReactDOM = require('react-dom');
const SettingsPage = require('./components/SettingsPage.jsx'); const SettingsPage = require('./components/SettingsPage.jsx');

3
src/main/squirrelStartup.js
View file

@ -1,4 +1,5 @@
const AutoLaunch = require('auto-launch'); const AutoLaunch = require('auto-launch');
const {app} = require('electron');
function shouldQuitApp(cmd) { function shouldQuitApp(cmd) {
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
@ -9,7 +10,7 @@ function shouldQuitApp(cmd) {
async function setupAutoLaunch(cmd) { async function setupAutoLaunch(cmd) {
const appLauncher = new AutoLaunch({ const appLauncher = new AutoLaunch({
name: 'Mattermost', name: app.getName(),
isHidden: true isHidden: true
}); });
if (cmd === '--squirrel-uninstall') { if (cmd === '--squirrel-uninstall') {