[MM-40635] Fix notifications and badges broken during test changes (#1934)

This commit is contained in:
Devin Binnie
2021-12-23 16:49:12 -05:00
committed by GitHub
parent 9a518e8e76
commit c28b219362
2 changed files with 11 additions and 7 deletions

View File

@@ -104,7 +104,7 @@ const anyExpired = () => {
};
// add any other event emitter methods if needed
export const on = status.emitter.on;
export const on = status.emitter.on.bind(status.emitter);
const setSessionExpired = (serverName: string, expired: boolean) => {
const isExpired = Boolean(expired);

View File

@@ -101,13 +101,17 @@ export class MattermostView extends EventEmitter {
}
this.view.webContents.on('did-finish-load', () => {
// wait for screen to truly finish loading before sending the message down
const timeout = setInterval(() => {
if (!this.view.webContents.isLoading()) {
try {
this.view.webContents.send(SET_VIEW_OPTIONS, this.tab.name, this.tab.shouldNotify);
clearTimeout(timeout);
} catch (e) {
log.error('failed to send view options to view', this.tab.name);
}
}
}, 100);
});
this.contextMenu = new ContextMenu({}, this.view);