if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #280 from KiranNiranjan/ELECTRON-222

Browse Source 
Electron-222 (Fixes Notifications Javascript Error)
This commit is contained in:
Vikas Shashidhar 2018-01-03 16:32:08 +05:30 committed by GitHub
commit 6ca2aaa227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/notify/electron-notify.js
View File

@ -165,6 +165,7 @@ function updateConfig(customConfig) {
if (customConfig.display) {
displayId = customConfig.display;
}
closeAll();
}
/**
@ -477,6 +478,13 @@ function setNotificationContents(notfWindow, notfObj) {
*/
function buildCloseNotification(notificationWindow, notificationObj, getTimeoutId) {
return function(event) {
// safety check to prevent from using an
// already destroyed notification window
if (notificationWindow.isDestroyed()) {
return new Promise(function(exitEarly) { exitEarly() })
}
if (closedNotifications[notificationObj.id]) {
delete closedNotifications[notificationObj.id];
return new Promise(function(exitEarly) { exitEarly() });
@ -711,6 +719,28 @@ function cleanUpInactiveWindow() {
inactiveWindows = [];
}
/**
* Closes all the notifications and windows
*/
function closeAll() {
// Clear out animation Queue and close windows
animationQueue.clear();
activeNotifications.forEach(function(window) {
if (window.displayTimer) {
clearTimeout(window.displayTimer);
}
window.close();
});
cleanUpInactiveWindow();
// Reset certain vars
nextInsertPos = {};
activeNotifications = [];
}
module.exports.notify = notify;
module.exports.updateConfig = updateConfig;
module.exports.reset = setupConfig;