Merge branch 'release/0.1.1'

macav · May 6, 2018 · 6fd7174 · 6fd7174
2 parents 39077d1 + f28aeda
commit 6fd7174
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -37,6 +37,11 @@
     "productName": "Hotelier",
     "electronVersion": "2.0.0",
     "asar": true,
+    "mac": {
+      "extendInfo": {
+        "LSUIElement": 1
+      }
+    },
     "linux": {
       "target": [
         {
@@ -45,7 +50,8 @@
             "x64"
           ]
         }
-      ]
+      ],
+      "category": "Development"
     },
     "win": {
       "target": [

diff --git a/public/electron.js b/public/electron.js
@@ -7,7 +7,9 @@ const assetsDirectory = path.join(__dirname, './assets')
 let tray = undefined
 let window = undefined
 
-app.dock.hide()
+if (process.platform === 'darwin') {
+  app.dock.hide()
+}
 
 app.on('ready', () => {
   createTray()