From e280226abccda84b9cebb8cae15802faa7795f29 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 26 Oct 2018 14:41:49 +1100 Subject: [PATCH] fix issue with content picker always setting a dirty state --- .../contentpicker/contentpicker.controller.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 70572a5bcf..8bbf440fae 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 @@ -282,7 +282,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper }); /** Syncs the renderModel based on the actual model.value and returns a promise */ - function syncRenderModel() { + function syncRenderModel(validate) { var valueIds = $scope.model.value ? $scope.model.value.split(',') : []; @@ -324,7 +324,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper }); - validate(); + if (validate) { + validate(); + } + setSortingState($scope.renderModel); return $q.when(true); }); @@ -344,7 +347,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper } } - validate(); + if (validate) { + validate(); + } + setSortingState($scope.renderModel); return $q.when(true); } @@ -425,7 +431,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper } function init() { - syncRenderModel().then(function () { + syncRenderModel(false).then(function () { //everything is loaded, start the watch on the model startWatch(); subscribe();