Update Electron to 1.6.10

- Desktop notification for Windows 7
- Per-monitor DPI awareness
This commit is contained in:
Yuya Ochiai 2017-06-01 00:08:29 +09:00
parent 481bf963f0
commit 854ed8a7d9
3 changed files with 7 additions and 15 deletions

View file

@ -12,6 +12,12 @@ Release date: TBD
### Improvements ### 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 ### Bug Fixes
--- ---

View file

@ -47,7 +47,7 @@
"cross-env": "^4.0.0", "cross-env": "^4.0.0",
"css-loader": "^0.28.1", "css-loader": "^0.28.1",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "1.6.6", "electron": "1.6.10",
"electron-builder": "17.4.0", "electron-builder": "17.4.0",
"electron-builder-squirrel-windows": "17.4.0", "electron-builder-squirrel-windows": "17.4.0",
"electron-connect": "^0.6.1", "electron-connect": "^0.6.1",

View file

@ -56,7 +56,6 @@ const os = require('os');
const path = require('path'); const path = require('path');
var settings = require('./common/settings'); var settings = require('./common/settings');
const osVersion = require('./common/osVersion');
var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json')); var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json'));
const {createMainWindow} = require('./main/mainWindow'); const {createMainWindow} = require('./main/mainWindow');
const appMenu = require('./main/menus/app'); const appMenu = require('./main/menus/app');
@ -428,19 +427,6 @@ app.on('ready', () => {
mainWindow.focus(); 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 overlay icon from dataURL
// Set trayicon to show "dot" // Set trayicon to show "dot"