From 31c9afac7614c963d9f0d5839a8f56c32cf48401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.com>
Date: Tue, 2 Jun 2020 09:38:00 +0200
Subject: [PATCH] make js up to date

---
 .../src/common/services/blockeditor.service.js | 18 +++++++++---------
 .../blocklist/blocklist.component.js           |  4 ++--
 .../blocklist.blockconfiguration.controller.js |  2 +-
 3 files changed, 12 insertions(+), 12 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 eaf2fc79fc..8adf90af74 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
@@ -284,13 +284,14 @@
 
                 var blockModel = {};
                 blockModel.key = String.CreateGuid().replace(/-/g, "");
-                blockModel.config = angular.copy(blockConfiguration);
+                blockModel.config = Utilities.copy(blockConfiguration);
                 if (blockModel.config.label && blockModel.config.label !== "") {
                     blockModel.labelInterpolator = $interpolate(blockModel.config.label);
                 }
-                blockModel.updateLabel = _.debounce(function() {
+                blockModel.__scope = this.isolatedScope;
+                blockModel.updateLabel = _.debounce(function () {this.__scope.$evalAsync(function() {
                     this.label = getBlockLabel(this);
-                }, 100);
+                }.bind(this))}.bind(blockModel), 10);
 
                 var contentScaffold = this.getScaffoldFor(blockConfiguration.contentTypeAlias);
                 if(contentScaffold === null) {
@@ -298,7 +299,7 @@
                 }
 
                 // make basics from scaffold
-                blockModel.content = angular.copy(contentScaffold);
+                blockModel.content = Utilities.copy(contentScaffold);
                 blockModel.content.udi = udi;
 
                 mapToElementModel(blockModel.content, dataModel);
@@ -314,7 +315,7 @@
                     }
 
                     // make basics from scaffold
-                    blockModel.settings = angular.copy(settingsScaffold);
+                    blockModel.settings = Utilities.copy(settingsScaffold);
                     layoutEntry.settings = layoutEntry.settings || { key: String.CreateGuid(), contentTypeAlias: blockConfiguration.settingsElementTypeAlias };
                     if (!layoutEntry.settings.key) { layoutEntry.settings.key = String.CreateGuid(); }
                     if (!layoutEntry.settings.contentTypeAlias) { layoutEntry.settings.contentTypeAlias = blockConfiguration.settingsElementTypeAlias; }
@@ -340,9 +341,7 @@
             destroyBlockModel: function(blockModel) {
 
                 // remove property value watchers:
-                for (const w of blockModel.watchers) {
-                    w();
-                }
+                blockModel.watchers.forEach(w => { w(); });
                 
                 // remove model from isolatedScope.
                 delete this.isolatedScope.blockModels[blockModel.key];
@@ -405,7 +404,7 @@
              */
             createFromElementType: function(elementTypeDataModel) {
 
-                elementTypeDataModel = angular.copy(elementTypeDataModel);
+                elementTypeDataModel = Utilities.copy(elementTypeDataModel);
 
                 var contentTypeAlias = elementTypeDataModel.contentTypeAlias;
 
@@ -457,6 +456,7 @@
                 delete this.blockConfigurations;
                 delete this.scaffolds;
                 delete this.watchers;
+                this.isolatedScope.$destroy();
                 delete this.isolatedScope;
             }
         }
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 a2218ceb82..68302f2f31 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
@@ -203,11 +203,11 @@
         function editBlock(blockModel, openSettings) {
 
             // make a clone to avoid editing model directly.
-            var blockContentClone = angular.copy(blockModel.content);
+            var blockContentClone = Utilities.copy(blockModel.content);
             var blockSettingsClone = null;
 
             if (blockModel.config.settingsElementTypeAlias) {
-                blockSettingsClone = angular.copy(blockModel.settings);
+                blockSettingsClone = Utilities.copy(blockModel.settings);
             }
 
             var hideContent = (openSettings === true && inlineEditing === true);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
index d24f266dca..4d41336251 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
@@ -162,7 +162,7 @@
 
             localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [vm.getElementTypeByAlias(block.contentTypeAlias).name]).then(function (data) {
 
-                var clonedBlockData = angular.copy(block);
+                var clonedBlockData = Utilities.copy(block);
                 vm.openBlock = block;
 
                 var overlayModel = {