sysExtManager -> nativeExtMangaer
This commit is contained in:
@@ -60,7 +60,7 @@ class ComponentView {
|
|||||||
|
|
||||||
if(component) {
|
if(component) {
|
||||||
componentManager.activateComponent(component);
|
componentManager.activateComponent(component);
|
||||||
console.log("Loading", $scope.component.name, $scope.getUrl(), component.valid_until, $scope.component);
|
console.log("Loading", $scope.component.name, $scope.getUrl(), component.valid_until);
|
||||||
|
|
||||||
$scope.reloadStatus();
|
$scope.reloadStatus();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ let ClientDataDomain = "org.standardnotes.sn.components";
|
|||||||
|
|
||||||
class ComponentManager {
|
class ComponentManager {
|
||||||
|
|
||||||
constructor($rootScope, modelManager, syncManager, desktopManager, sysExtManager, $timeout, $compile) {
|
constructor($rootScope, modelManager, syncManager, desktopManager, nativeExtManager, $timeout, $compile) {
|
||||||
this.$compile = $compile;
|
this.$compile = $compile;
|
||||||
this.$rootScope = $rootScope;
|
this.$rootScope = $rootScope;
|
||||||
this.modelManager = modelManager;
|
this.modelManager = modelManager;
|
||||||
this.syncManager = syncManager;
|
this.syncManager = syncManager;
|
||||||
this.desktopManager = desktopManager;
|
this.desktopManager = desktopManager;
|
||||||
this.sysExtManager = sysExtManager;
|
this.nativeExtManager = nativeExtManager;
|
||||||
this.timeout = $timeout;
|
this.timeout = $timeout;
|
||||||
this.streamObservers = [];
|
this.streamObservers = [];
|
||||||
this.contextStreamObservers = [];
|
this.contextStreamObservers = [];
|
||||||
@@ -244,7 +244,7 @@ class ComponentManager {
|
|||||||
if(component.offlineOnly || (isDesktopApplication() && component.local_url)) {
|
if(component.offlineOnly || (isDesktopApplication() && component.local_url)) {
|
||||||
return component.local_url && component.local_url.replace("sn://", this.desktopManager.getApplicationDataPath() + "/");
|
return component.local_url && component.local_url.replace("sn://", this.desktopManager.getApplicationDataPath() + "/");
|
||||||
} else {
|
} else {
|
||||||
return component.url || component.hosted_url;
|
return component.hosted_url || component.url;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -319,7 +319,7 @@ class ComponentManager {
|
|||||||
removePrivatePropertiesFromResponseItems(responseItems, component, options = {}) {
|
removePrivatePropertiesFromResponseItems(responseItems, component, options = {}) {
|
||||||
if(component) {
|
if(component) {
|
||||||
// System extensions can bypass this step
|
// System extensions can bypass this step
|
||||||
if(this.sysExtManager.isSystemExtension(component)) {
|
if(this.nativeExtManager.isSystemExtension(component)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -548,7 +548,7 @@ class ComponentManager {
|
|||||||
|
|
||||||
handleInstallLocalComponentMessage(sourceComponent, message) {
|
handleInstallLocalComponentMessage(sourceComponent, message) {
|
||||||
// Only extensions manager has this permission
|
// Only extensions manager has this permission
|
||||||
if(!this.sysExtManager.isSystemExtension(sourceComponent)) {
|
if(!this.nativeExtManager.isSystemExtension(sourceComponent)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* A class for handling installation of system extensions */
|
/* A class for handling installation of system extensions */
|
||||||
|
|
||||||
class SysExtManager {
|
class NativeExtManager {
|
||||||
|
|
||||||
constructor(modelManager, syncManager, singletonManager) {
|
constructor(modelManager, syncManager, singletonManager) {
|
||||||
this.modelManager = modelManager;
|
this.modelManager = modelManager;
|
||||||
@@ -89,4 +89,4 @@ class SysExtManager {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
angular.module('app').service('sysExtManager', SysExtManager);
|
angular.module('app').service('nativeExtManager', NativeExtManager);
|
||||||
6
package-lock.json
generated
6
package-lock.json
generated
@@ -5781,9 +5781,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"sn-stylekit": {
|
"sn-stylekit": {
|
||||||
"version": "1.0.1195",
|
"version": "1.0.1196",
|
||||||
"resolved": "https://registry.npmjs.org/sn-stylekit/-/sn-stylekit-1.0.1195.tgz",
|
"resolved": "https://registry.npmjs.org/sn-stylekit/-/sn-stylekit-1.0.1196.tgz",
|
||||||
"integrity": "sha512-XPutiDkA0Jbf3fGHjC6avoWbMsLJKLOXnPJDpE2VFA2/HUf87sjyTvvhg8mrRT2IiE8Cr0gJFQr/ALnoP+u1EQ==",
|
"integrity": "sha512-/6P0m4A+TEwJ6VxstiEzCCfBheWz5c8Y/B209cItqLX+9ltfg4yEUaTHG/Q/TMKPID8or4CiiMLzj+6SwuMqGQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"snake-case": {
|
"snake-case": {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
"karma-cli": "^1.0.1",
|
"karma-cli": "^1.0.1",
|
||||||
"karma-jasmine": "^1.1.0",
|
"karma-jasmine": "^1.1.0",
|
||||||
"karma-phantomjs-launcher": "^1.0.2",
|
"karma-phantomjs-launcher": "^1.0.2",
|
||||||
"sn-stylekit": "^1.0.1195"
|
"sn-stylekit": "^1.0.1196"
|
||||||
},
|
},
|
||||||
"license": "GPL-3.0"
|
"license": "GPL-3.0"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user