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

[MM-25789] - Update default settings for new installations (#1376)

Browse Source 
* [MM-25789] - Update default settings for new installations

* Update src/main.js

Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>

* Update src/main.js

Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>

* Fix linter

Co-authored-by: Nevyana Angelova <nevyangelova@Nevyanas-MacBook-Pro-2.local>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>
This commit is contained in:
Nev Angelova
2020-09-29 17:31:54 +03:00
committed by GitHub
parent 34e1a030b9
commit 34af973316
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/config/defaultPreferences.js
View File

@@ -9,9 +9,9 @@
const defaultPreferences = { const defaultPreferences = {
version: 2, version: 2,
teams: [], teams: [],
showTrayIcon: false, showTrayIcon: true,
trayIconTheme: 'light', trayIconTheme: 'light',
minimizeToTray: false, minimizeToTray: true,
notifications: { notifications: {
flashWindow: 2, flashWindow: 2,
bounceIcon: true, bounceIcon: true,

5
src/main.js
View File

@@ -1145,10 +1145,7 @@ function getDeeplinkingURL(args) {
} }
function shouldShowTrayIcon() { function shouldShowTrayIcon() {
if (process.platform === 'win32') { if (config.showTrayIcon === true || process.platform === 'win32') {
return true;
}
if (['darwin', 'linux'].includes(process.platform) && config.showTrayIcon === true) {
return true; return true;
} }
return false; return false;