yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up redundant code

Browse Source
This commit is contained in:
Mads Rasmussen
2017-01-17 20:48:00 +01:00
parent 4612183b13
commit 2964f9a1c7
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
View File

@@ -194,19 +194,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
});
if (currIds.indexOf(item.id) < 0) {
// get url for content and media items
if(entityType !== "Member") {
entityResource.getUrl(item.id, entityType).then(function(data){
// update url
item.url = data.url;
// push item to render model
addSelectedItem(item);
});
} else {
addSelectedItem(item);
}
setEntityUrl(item);
}
};
@@ -241,17 +229,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
});
if (entity) {
// get url for content and media items
if(entityType !== "Member") {
entityResource.getUrl(entity.id, entityType).then(function(data){
// update url
entity.url = data.url;
// push item to render model
addSelectedItem(entity);
});
} else {
addSelectedItem(entity);
}
setEntityUrl(entity);
}
});
@@ -261,6 +239,20 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
});
function setEntityUrl(entity) {
// get url for content and media items
if(entityType !== "Member") {
entityResource.getUrl(entity.id, entityType).then(function(data){
// update url
entity.url = data.url;
// push item to render model
addSelectedItem(entity);
});
} else {
addSelectedItem(entity);
}
}
function addSelectedItem(item) {
// set icon