add setting to disable icon tray option for darwin

mattermost · Oct 12, 2017 · 5e33705 · 5e33705
1 parent 17da72b
commit 5e33705
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
@@ -399,7 +399,8 @@ const SettingsPage = createReactClass({
         </Checkbox>);
     }
 
-    if (process.platform === 'darwin' || process.platform === 'linux') {
+    var shouldShowDarwinTray = this.state.allowDarwinIconTray && process.platform === 'darwin';
+    if (process.platform === 'linux' || shouldShowDarwinTray) {
       options.push(
         <Checkbox
           key='inputShowTrayIcon'

diff --git a/src/common/config/base.json b/src/common/config/base.json
@@ -13,7 +13,8 @@
     "spellCheckerLocale": "en-US",
     "helpLink": "https://docs.mattermost.com/help/apps/desktop-guide.html",
     "enableMultiTeams": true,
-    "enableServerManagement": true
+    "enableServerManagement": true,
+    "allowDarwinIconTray": true
   },
   "1": {
     "teams": [],
@@ -29,6 +30,7 @@
     "spellCheckerLocale": "en-US",
     "helpLink": "https://docs.mattermost.com/help/apps/desktop-guide.html",
     "enableMultiTeams": true,
-    "enableServerManagement": true
+    "enableServerManagement": true,
+    "allowDarwinIconTray": true
   }
 }