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

Fix component reloading after destruction

Browse Source
This commit is contained in:
Baptiste Grob
2020-03-18 14:48:43 +01:00
parent be9287c70a
commit c58c5e47b2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/directives/views/componentView.js
View File

@@ -24,6 +24,7 @@ class ComponentViewCtrl {
this.desktopManager = desktopManager; this.desktopManager = desktopManager;
this.componentManager = componentManager; this.componentManager = componentManager;
this.componentValid = true; this.componentValid = true;
this.destroyed = false;
$scope.$watch('ctrl.component', (component, prevComponent) => { $scope.$watch('ctrl.component', (component, prevComponent) => {
this.componentValueDidSet(component, prevComponent); this.componentValueDidSet(component, prevComponent);
@@ -32,6 +33,7 @@ class ComponentViewCtrl {
this.reloadStatus(false); this.reloadStatus(false);
}); });
$scope.$on('$destroy', () => { $scope.$on('$destroy', () => {
this.destroyed = true;
this.destroy(); this.destroy();
}); });
} }
@@ -92,6 +94,7 @@ class ComponentViewCtrl {
async reloadComponent() { async reloadComponent() {
this.componentValid = false; this.componentValid = false;
await this.componentManager.reloadComponent(this.component); await this.componentManager.reloadComponent(this.component);
if (this.destroyed) return;
this.reloadStatus(); this.reloadStatus();
} }