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

fix: proper reload of ext data

Browse Source
This commit is contained in:
Mo Bitar
2020-09-25 11:48:55 -05:00
parent b74c85638d
commit 8679bf5b30
6 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
import { RootScopeMessages } from './../../messages';
import { WebApplication } from '@/ui_models/application'; import { WebApplication } from '@/ui_models/application';
import { SNComponent, ComponentAction, LiveItem } from 'snjs'; import { SNComponent, ComponentAction, LiveItem } from 'snjs';
import { WebDirective } from './../../types'; import { WebDirective } from './../../types';
@@ -199,7 +200,7 @@ class ComponentViewCtrl implements ComponentViewScope {
this.error = undefined; this.error = undefined;
} }
if (this.expired && doManualReload) { if (this.expired && doManualReload) {
this.$rootScope.$broadcast('reload-ext-dat'); this.$rootScope.$broadcast(RootScopeMessages.ReloadExtendedData);
} }
} }

4
app/assets/javascripts/messages.ts Normal file
View File

@@ -0,0 +1,4 @@
export enum RootScopeMessages {
ReloadExtendedData = 'reload-ext-data',
NewUpdateAvailable = 'new-update-available'
}

3
app/assets/javascripts/views/application/application_view.ts
View File

@@ -1,3 +1,4 @@
import { RootScopeMessages } from './../../messages';
import { WebDirective } from '@/types'; import { WebDirective } from '@/types';
import { getPlatformString } from '@/utils'; import { getPlatformString } from '@/utils';
import template from './application-view.pug'; import template from './application-view.pug';
@@ -82,7 +83,7 @@ class ApplicationViewCtrl extends PureViewCtrl {
} }
onUpdateAvailable() { onUpdateAvailable() {
this.$rootScope!.$broadcast('new-update-available'); this.$rootScope!.$broadcast(RootScopeMessages.NewUpdateAvailable);
}; };
/** @override */ /** @override */

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

@@ -1,3 +1,4 @@
import { RootScopeMessages } from './../../messages';
import { ApplicationGroup } from '@/ui_models/application_group'; import { ApplicationGroup } from '@/ui_models/application_group';
import { FooterStatus, WebDirective } from '@/types'; import { FooterStatus, WebDirective } from '@/types';
import { dateToLocalizedString, preventRefreshing } from '@/utils'; import { dateToLocalizedString, preventRefreshing } from '@/utils';
@@ -171,10 +172,10 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
} }
addRootScopeListeners() { addRootScopeListeners() {
this.rootScopeListener1 = this.$rootScope.$on("reload-ext-data", () => { this.rootScopeListener1 = this.$rootScope.$on(RootScopeMessages.ReloadExtendedData, () => {
this.reloadExtendedData(); this.reloadExtendedData();
}); });
this.rootScopeListener2 = this.$rootScope.$on("new-update-available", () => { this.rootScopeListener2 = this.$rootScope.$on(RootScopeMessages.NewUpdateAvailable, () => {
this.$timeout(() => { this.$timeout(() => {
this.onNewUpdateAvailable(); this.onNewUpdateAvailable();
}); });

2
app/assets/templates/directives/component-view.pug
View File

@@ -25,7 +25,7 @@
.sk-p .sk-p
| Extensions are in a read-only state. | Extensions are in a read-only state.
.right .right
.sk-app-bar-item(ng-click='ctrl.reloadIframe()') .sk-app-bar-item(ng-click='ctrl.reloadStatus(true)')
.sk-button.info .sk-button.info
.sk-label Reload .sk-label Reload
.sk-app-bar-item .sk-app-bar-item

4
dist/@types/app/assets/javascripts/messages.d.ts vendored Normal file
View File

@@ -0,0 +1,4 @@
export declare enum RootScopeMessages {
ReloadExtendedData = "reload-ext-data",
NewUpdateAvailable = "new-update-available"
}