From 2b15012358d3a466ceaabbb0952df1edcf4e45d9 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 - Desktop notification for Windows 7 - Per-monitor DPI awareness --- package.json | 2 +- src/main.js | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/package.json b/package.json index d366ed3e..8e80535c 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "chai": "^3.5.0", "cross-env": "^3.1.4", "devtron": "^1.4.0", - "electron": "1.6.2", + "electron": "1.6.10", "electron-builder": "^14.5.3", "electron-builder-squirrel-windows": "^15.0.0", "electron-connect": "^0.6.1", diff --git a/src/main.js b/src/main.js index bcf284d0..d1f81e9c 100644 --- a/src/main.js +++ b/src/main.js @@ -56,7 +56,6 @@ const os = require('os'); const path = require('path'); var settings = require('./common/settings'); -const osVersion = require('./common/osVersion'); var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json')); const {createMainWindow} = require('./main/mainWindow'); const appMenu = require('./main/menus/app'); @@ -428,19 +427,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"