rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: remove app observer on controller deinit

Browse Source
This commit is contained in:
Baptiste Grob
2020-06-27 13:08:58 +02:00
parent 7a7aecfb3b
commit db914ee4bf
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/views/footer/footer_view.ts
View File

@@ -55,6 +55,7 @@ class FooterViewCtrl extends PureViewCtrl {
public newUpdateAvailable = false public newUpdateAvailable = false
public dockShortcuts: DockShortcut[] = [] public dockShortcuts: DockShortcut[] = []
public roomShowState: Partial<Record<string, boolean>> = {} public roomShowState: Partial<Record<string, boolean>> = {}
private observerRemovers: Array<() => void> = [];
/* @ngInject */ /* @ngInject */
constructor( constructor(
@@ -69,6 +70,8 @@ class FooterViewCtrl extends PureViewCtrl {
} }
deinit() { deinit() {
for (const remove of this.observerRemovers) remove();
this.observerRemovers.length = 0;
this.rooms.length = 0; this.rooms.length = 0;
this.themesWithIcons.length = 0; this.themesWithIcons.length = 0;
this.unregisterComponent(); this.unregisterComponent();
@@ -219,7 +222,7 @@ class FooterViewCtrl extends PureViewCtrl {
} }
) )
this.application!.streamItems( this.observerRemovers.push(this.application!.streamItems(
ContentType.Component, ContentType.Component,
async () => { async () => {
const components = this.application!.getItems(ContentType.Component) as SNComponent[]; const components = this.application!.getItems(ContentType.Component) as SNComponent[];
@@ -231,16 +234,16 @@ class FooterViewCtrl extends PureViewCtrl {
this.reloadExtendedData(); this.reloadExtendedData();
} }
} }
); ));
this.application!.streamItems( this.observerRemovers.push(this.application!.streamItems(
ContentType.Theme, ContentType.Theme,
async () => { async () => {
const themes = this.application!.getDisplayableItems(ContentType.Theme) as SNTheme[]; const themes = this.application!.getDisplayableItems(ContentType.Theme) as SNTheme[];
this.themesWithIcons = themes; this.themesWithIcons = themes;
this.reloadDockShortcuts(); this.reloadDockShortcuts();
} }
); ));
} }
registerComponentHandler() { registerComponentHandler() {

11
app/assets/javascripts/views/notes/notes_view.ts
View File

@@ -66,6 +66,7 @@ class NotesViewCtrl extends PureViewCtrl {
private searchKeyObserver: any private searchKeyObserver: any
private noteFlags: Partial<Record<UuidString, NoteFlag[]>> = {} private noteFlags: Partial<Record<UuidString, NoteFlag[]>> = {}
private unsubEditorChange: any private unsubEditorChange: any
private removeObservers: Array<() => void> = [];
/* @ngInject */ /* @ngInject */
constructor($timeout: ng.ITimeoutService, ) { constructor($timeout: ng.ITimeoutService, ) {
@@ -89,6 +90,8 @@ class NotesViewCtrl extends PureViewCtrl {
} }
deinit() { deinit() {
for (const remove of this.removeObservers) remove();
this.removeObservers.length = 0;
this.panelPuppet!.onReady = undefined; this.panelPuppet!.onReady = undefined;
this.panelPuppet = undefined; this.panelPuppet = undefined;
window.removeEventListener('resize', this.onWindowResize, true); window.removeEventListener('resize', this.onWindowResize, true);
@@ -198,7 +201,7 @@ class NotesViewCtrl extends PureViewCtrl {
} }
streamNotesAndTags() { streamNotesAndTags() {
this.application!.streamItems( this.removeObservers.push(this.application!.streamItems(
[ContentType.Note], [ContentType.Note],
async (items) => { async (items) => {
const notes = items as SNNote[]; const notes = items as SNNote[];
@@ -222,9 +225,9 @@ class NotesViewCtrl extends PureViewCtrl {
this.selectFirstNote(); this.selectFirstNote();
} }
} }
); ));
this.application!.streamItems( this.removeObservers.push(this.application!.streamItems(
[ContentType.Tag], [ContentType.Tag],
async (items) => { async (items) => {
const tags = items as SNTag[]; const tags = items as SNTag[];
@@ -236,7 +239,7 @@ class NotesViewCtrl extends PureViewCtrl {
this.reloadPanelTitle(); this.reloadPanelTitle();
} }
} }
); ));
} }
async selectNote(note: SNNote) { async selectNote(note: SNNote) {