From 2964f9a1c7596ecc4796d715dd0ef2257018e67a Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 17 Jan 2017 20:48:00 +0100 Subject: [PATCH] clean up redundant code --- .../contentpicker/contentpicker.controller.js | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 1ebfe81905..c191ee5518 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -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