From 336ff764dc2b67dd26d7ac22a08a919be6fba796 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 1 Jun 2017 00:08:29 +0900 Subject: [PATCH] Update Electron to 1.6.10 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- src/main.js | 13 ------------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d393d94eacd..8291e4c3056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ Release date: TBD ### Improvements +#### Windows + - [Windows 7/8] Added support to open the message when clicking desktop notification. + [#67](https://github.com/mattermost/desktop/issues/67) + - Added support for different DPI across monitors. + [#357](https://github.com/mattermost/desktop/issues/357) + ### Bug Fixes --- diff --git a/package.json b/package.json index 84136bc72dd..54375de8663 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "cross-env": "^4.0.0", "css-loader": "^0.28.1", "devtron": "^1.4.0", - "electron": "1.6.6", + "electron": "1.6.10", "electron-builder": "17.4.0", "electron-builder-squirrel-windows": "17.4.0", "electron-connect": "^0.6.1", diff --git a/src/main.js b/src/main.js index bcf284d0fc1..b56791ec8c5 100644 --- a/src/main.js +++ b/src/main.js @@ -428,19 +428,6 @@ app.on('ready', () => { mainWindow.focus(); }); - ipcMain.on('notified', (event, arg) => { - if (process.platform === 'win32') { - // On Windows 8.1 and Windows 8, a shortcut with a Application User Model ID must be installed to the Start screen. - // In current version, use tray balloon for notification - if (osVersion.isLowerThanOrEqualWindows8_1()) { - trayIcon.displayBalloon({ - icon: path.resolve(assetsDir, 'appicon.png'), - title: arg.title, - content: arg.options.body - }); - } - } - }); // Set overlay icon from dataURL // Set trayicon to show "dot"