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

Updates desktopManager to handle extServer, bump dependencies, 3.0.22

Browse Source
This commit is contained in:
Mo Bitar
2019-11-21 16:01:11 -06:00
parent ec0555ad26
commit 7cbbf5ae1b
6 changed files with 127 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/app/services/desktopManager.js
View File

@@ -32,9 +32,9 @@ class DesktopManager {
this.majorDataChangeHandler && this.majorDataChangeHandler();
}
getApplicationDataPath() {
console.assert(this.applicationDataPath, "applicationDataPath is null");
return this.applicationDataPath;
getExtServerHost() {
console.assert(this.extServerHost, "extServerHost is null");
return this.extServerHost;
}
/*
@@ -152,9 +152,9 @@ class DesktopManager {
}
/* Used to resolve "sn://" */
desktop_setApplicationDataPath(path) {
this.applicationDataPath = path;
this.$rootScope.$broadcast("desktop-did-set-application-path");
desktop_setExtServerHost(host) {
this.extServerHost = host;
this.$rootScope.$broadcast("desktop-did-set-ext-server-host");
}
desktop_setComponentInstallationSyncHandler(handler) {

2
app/assets/javascripts/app/services/themeManager.js
View File

@@ -18,7 +18,7 @@ class ThemeManager {
})
if(desktopManager.isDesktop) {
$rootScope.$on("desktop-did-set-application-path", () => {
$rootScope.$on("desktop-did-set-ext-server-host", () => {
this.activateCachedThemes();
})
} else {