Upgrade to Electron 1.8.2 / Node.js 8.2.1 (#2066)
* Upgrade to Electron 1.8.2 / Node.js 8.2.1 * Update CI Node.js versions * Make `engines` top-level property This was accidentally included under `build` which is disallowed by `electron-builder`. * Refactor notification updates Allows easier debugging through variable inspection. * Use `appId` for Application User Model ID Recommended in: https://github.com/electron/electron/issues/10864#issuecomment-346229090 * Update `spectron` to 3.8.0 * Bump `electron-builder` based dependencies * Use `config.extraMetadata` instead of `em` Prevents `Unknown argument: em` error. See: https://github.com/electron-userland/electron-builder/issues/2615 * Revert AUMID to be based on `packageJson.name` In our build artifact `packageJson.build.appId` causes an NPE.
This commit is contained in:
parent
3a334f3d8d
commit
a4c52b8d64
7 changed files with 29 additions and 25 deletions
|
@ -26,9 +26,10 @@
|
|||
this.trigger('click', conversation);
|
||||
},
|
||||
update: function() {
|
||||
const isFocused = window.isFocused();
|
||||
console.log(
|
||||
'updating notifications - count:', this.length,
|
||||
'focused:', window.isFocused(),
|
||||
'focused:', isFocused,
|
||||
'enabled:', enabled
|
||||
);
|
||||
if (!enabled) {
|
||||
|
@ -37,8 +38,9 @@
|
|||
if (this.length === 0) {
|
||||
return;
|
||||
}
|
||||
if (window.isFocused()) {
|
||||
// The window is focused. Consider yourself notified.
|
||||
|
||||
const isNotificationOmitted = isFocused;
|
||||
if (isNotificationOmitted) {
|
||||
this.clear();
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue