phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upgrade to Electron 6 (#1152)

Browse Source 
- includes update to electron-builder 22
- includes deprication update to powerMonitor
This commit is contained in:
Dean Whillier
2020-01-16 17:47:13 -05:00
committed by GitHub
parent 5a237d8d88
commit 9f2c1b6f86
3 changed files with 548 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

699
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@@ -53,8 +53,8 @@
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"css-loader": "^1.0.1", "css-loader": "^1.0.1",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "^5.0.11", "electron": "^6.1.7",
"electron-builder": "^21.2.0", "electron-builder": "^22.2.0",
"electron-connect": "^0.6.3", "electron-connect": "^0.6.3",
"electron-notarize": "^0.1.1", "electron-notarize": "^0.1.1",
"eslint": "^5.9.0", "eslint": "^5.9.0",

4
src/main/UserActivityMonitor.js
View File

@@ -59,9 +59,7 @@ export default class UserActivityMonitor extends EventEmitter {
this.systemIdleTimeIntervalID = setInterval(() => { this.systemIdleTimeIntervalID = setInterval(() => {
try { try {
electron.powerMonitor.querySystemIdleTime((idleTime) => { this.updateIdleTime(electron.powerMonitor.getSystemIdleTime());
this.updateIdleTime(idleTime);
});
} catch (err) { } catch (err) {
console.log('Error getting system idle time:', err); console.log('Error getting system idle time:', err);
} }