From 5ad47aa6410374aa1480db7617c6537bdec3f807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 12 Jun 2020 13:35:05 +0200 Subject: [PATCH] use retriveValuesFrom method to transfer data. --- .../src/common/services/blockeditor.service.js | 6 +++--- .../views/propertyeditors/blocklist/blocklist.component.js | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js index 1efc09b3be..f36490fd1c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js @@ -421,12 +421,12 @@ layoutEntry.settings = null; } - blockModel.transferDataTo = function(otherBlockModel) { + blockModel.retriveValuesFrom = function(content, settings) { if (this.content !== null) { - blockEditorService.mapElementValues(this.content, otherBlockModel.content); + mapElementValues(content, this.content); } if (this.config.settingsElementTypeKey !== null) { - blockEditorService.mapElementValues(this.settings, otherBlockModel.settings); + mapElementValues(settings, this.settings); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js index 251cc8bcbb..c9ca360797 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js @@ -223,10 +223,9 @@ view: "views/common/infiniteeditors/blockeditor/blockeditor.html", size: blockModel.config.editorSize || "medium", submit: function(blockEditorModel) { - - // Now lets syncronize by transfer data back to our blockModel. - blockEditorModel.transferDataTo(blockModel); - + + blockModel.retriveValuesFrom(blockEditorModel.content, blockEditorModel.settings) + editorService.close(); }, close: function() {