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

sysExtManager -> nativeExtMangaer

Browse Source
This commit is contained in:
Mo Bitar
2018-02-01 10:33:51 -06:00
parent e20c1224d2
commit d2ac94a295
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ class ComponentView {
if(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();
}

10
app/assets/javascripts/app/services/componentManager.js
View File

@@ -3,13 +3,13 @@ let ClientDataDomain = "org.standardnotes.sn.components";
class ComponentManager {
constructor($rootScope, modelManager, syncManager, desktopManager, sysExtManager, $timeout, $compile) {
constructor($rootScope, modelManager, syncManager, desktopManager, nativeExtManager, $timeout, $compile) {
this.$compile = $compile;
this.$rootScope = $rootScope;
this.modelManager = modelManager;
this.syncManager = syncManager;
this.desktopManager = desktopManager;
this.sysExtManager = sysExtManager;
this.nativeExtManager = nativeExtManager;
this.timeout = $timeout;
this.streamObservers = [];
this.contextStreamObservers = [];
@@ -244,7 +244,7 @@ class ComponentManager {
if(component.offlineOnly || (isDesktopApplication() && component.local_url)) {
return component.local_url && component.local_url.replace("sn://", this.desktopManager.getApplicationDataPath() + "/");
} else {
return component.url || component.hosted_url;
return component.hosted_url || component.url;
}
}
@@ -319,7 +319,7 @@ class ComponentManager {
removePrivatePropertiesFromResponseItems(responseItems, component, options = {}) {
if(component) {
// System extensions can bypass this step
if(this.sysExtManager.isSystemExtension(component)) {
if(this.nativeExtManager.isSystemExtension(component)) {
return;
}
}
@@ -548,7 +548,7 @@ class ComponentManager {
handleInstallLocalComponentMessage(sourceComponent, message) {
// Only extensions manager has this permission
if(!this.sysExtManager.isSystemExtension(sourceComponent)) {
if(!this.nativeExtManager.isSystemExtension(sourceComponent)) {
return;
}

4
app/assets/javascripts/app/services/sysExtManager.js → app/assets/javascripts/app/services/nativeExtManager.js
View File

@@ -1,6 +1,6 @@
/* A class for handling installation of system extensions */
class SysExtManager {
class NativeExtManager {
constructor(modelManager, syncManager, singletonManager) {
this.modelManager = modelManager;
@@ -89,4 +89,4 @@ class SysExtManager {
}
angular.module('app').service('sysExtManager', SysExtManager);
angular.module('app').service('nativeExtManager', NativeExtManager);