Browse Source

only update menu for certain events

pull/2554/head
Kyle Spearrin 8 years ago
parent
commit
400f534ab3
  1. 13
      src/app/app.component.ts
  2. 6
      src/main/messaging.main.ts
  3. 2
      src/main/window.main.ts

13
src/app/app.component.ts

@ -89,13 +89,12 @@ export class AppComponent implements OnInit { @@ -89,13 +89,12 @@ export class AppComponent implements OnInit {
window.onkeypress = () => this.recordActivity();
this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
if (message.command !== 'updateAppMenu') {
await this.updateAppMenu();
}
this.ngZone.run(async () => {
switch (message.command) {
case 'loggedIn':
case 'unlocked':
case 'loggedOut':
this.updateAppMenu();
break;
case 'logout':
this.logOut(!!message.expired);
@ -105,8 +104,7 @@ export class AppComponent implements OnInit { @@ -105,8 +104,7 @@ export class AppComponent implements OnInit {
break;
case 'locked':
this.router.navigate(['lock']);
break;
case 'unlocked':
this.updateAppMenu();
break;
case 'syncStarted':
break;
@ -152,8 +150,7 @@ export class AppComponent implements OnInit { @@ -152,8 +150,7 @@ export class AppComponent implements OnInit {
this.toasterService.popAsync('warning', this.i18nService.t('loggedOut'),
this.i18nService.t('loginExpired'));
}
await this.router.navigate(['login']);
this.messagingService.send('loggedOut');
this.router.navigate(['login']);
});
}

6
src/main/messaging.main.ts

@ -45,12 +45,6 @@ export class MessagingMain { @@ -45,12 +45,6 @@ export class MessagingMain {
onMessage(message: any) {
switch (message.command) {
case 'loggedIn':
break;
case 'logout':
break;
case 'syncCompleted':
break;
case 'scheduleNextSync':
this.scheduleNextSync();
break;

2
src/main/window.main.ts

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
import { isDev } from '../scripts/utils';
import { app, BrowserWindow, screen } from 'electron';
import * as path from 'path';
import * as url from 'url';
import { Main } from '../main';
import { isDev } from '../scripts/utils';
export class WindowMain {
win: BrowserWindow;

Loading…
Cancel
Save