swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maybe works?

Browse Source
This commit is contained in:
Kevin Giszewski
2017-09-13 21:56:43 -04:00
parent 0f9a44c539
commit 4443d628dc
2 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/controller.js
-1
View File
@@ -1004,5 +1004,4 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
}
return null;
}
});
app/services/archetypeCacheService.js
+10 -26
View File
@@ -1,14 +1,8 @@
angular.module('umbraco.services').factory('archetypeCacheService', function (archetypePropertyEditorResource) {
//private
var isEntityLookupLoading = false;
var entityCache = [];
var isDatatypeLookupLoading = false;
var datatypeCache = [];
return {
initialize: function() {
return archetypePropertyEditorResource.getAllDataTypesForCache().then(function(data) {
@@ -33,6 +27,7 @@ angular.module('umbraco.services').factory('archetypeCacheService', function (ar
return null;
},
//perhaps this should return a promise?
getEntityById: function(scope, id, type) {
var cachedEntity = _.find(entityCache, function (e){
return e.id == id;
@@ -43,20 +38,14 @@ angular.module('umbraco.services').factory('archetypeCacheService', function (ar
}
//go get it from server
if (!isEntityLookupLoading) {
isEntityLookupLoading = true;
scope.resources.entityResource.getById(id, type).then(function(entity) {
entityCache.push(entity);
isEntityLookupLoading = false;
});
}
scope.resources.entityResource.getById(id, type).then(function(entity) {
entityCache.push(entity);
});
return null;
},
//perhaps this should return a promise?
getEntityByUmbracoId: function(scope, udi, type) {
var cachedEntity = _.find(entityCache, function (e){
return e.udi == udi;
@@ -67,18 +56,13 @@ angular.module('umbraco.services').factory('archetypeCacheService', function (ar
}
//go get it from server
if (!isEntityLookupLoading) {
isEntityLookupLoading = true;
scope.resources.entityResource.getByIds([udi], type).then(function (entities) {
// prevent infinite lookups with a default entity
var entity = entities.length > 0 ? entities[0] : { udi: udi, name: "" };
scope.resources.entityResource.getByIds([udi], type).then(function (entities) {
// prevent infinite lookups with a default entity
var entity = entities.length > 0 ? entities[0] : { udi: udi, name: "" };
entityCache.push(entity);
entityCache.push(entity);
isEntityLookupLoading = false;
});
}
});
return null;
}