aaron/mattermost-desktop
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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 548 additions and 159 deletions
Show stats 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",
"css-loader": "^1.0.1",
"devtron": "^1.4.0",
"electron": "^5.0.11",
"electron-builder": "^21.2.0",
"electron": "^6.1.7",
"electron-builder": "^22.2.0",
"electron-connect": "^0.6.3",
"electron-notarize": "^0.1.1",
"eslint": "^5.9.0",

4
src/main/UserActivityMonitor.js
View file

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