From 5b910c178a4f193d190367c4f1da3402aa8c4d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 2 Mar 2020 11:12:04 +0100
Subject: [PATCH] rename view to overlayView

---
 .../blocklist/blocklist.component.js                |  2 +-
 .../blocklist.elementtypepicker.controller.js       | 13 +++++--------
 .../prevalue/blocklist.elementtypepicker.html       |  6 +++---
 .../PropertyEditors/BlockListConfiguration.cs       |  4 ++--
 4 files changed, 11 insertions(+), 14 deletions(-)

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 5e450eb133..eefe339569 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
@@ -936,7 +936,7 @@
             
             var elementEditor = {
                 block: blockModel,
-                view: "views/common/infiniteeditors/elementeditor/elementeditor.html",
+                view: blockModel.overlayView || "views/common/infiniteeditors/elementeditor/elementeditor.html",
                 size: blockModel.overlaySize,
                 submit: function(model) {
                     blockModel.content = model.block.content;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.controller.js
index 77751579c9..1f76afef8e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.controller.js
@@ -150,7 +150,7 @@
 
             var entry = {
                 "contentTypeAlias": alias,
-                "view": null,
+                "overlayView": null,
                 "labelTemplate": "",
                 "settingsElementTypeAlias": null
             };
@@ -233,7 +233,7 @@
             localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
                 overlayService.confirmRemove({
                     title: data[0],
-                    content: localizationService.tokenReplace(data[1], [entry.view]),
+                    content: localizationService.tokenReplace(data[1], [entry.overlayView]),
                     close: function () {
                         overlayService.close();
                     },
@@ -245,7 +245,7 @@
             });
         };
         vm.removeViewForEntry = function(entry) {
-            entry.view = null;
+            entry.overlayView = null;
         };
         vm.addViewForEntry = function(entry) {
             const filePicker = {
@@ -255,13 +255,10 @@
                 entityType: "file",
                 isDialog: true,
                 filter: function (i) {
-                    if (i.name.indexOf(".html") !== -1) {
-                        return true;
-                    }
+                    return (i.name.indexOf(".html") !== -1);
                 },
                 select: function (file) {
-                    console.log(file);
-                    entry.view = file.name;
+                    entry.overlayView = file.name;
                     editorService.close();
                 },
                 close: function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.html
index 8184761a1a..75a59a0f2d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.elementtypepicker.html
@@ -36,16 +36,16 @@
                     <input type="text" ng-model="entry.label" class="text-input"/>
                 </div>
                 <div class="umb-table-cell">
-                    <div class="settings-input --hasValue" ng-if="entry.view !== null" >
+                    <div class="settings-input --hasValue" ng-if="entry.overlayView !== null" >
 
-                        <umb-node-preview icon="'icon-document'" name="entry.view"></umb-node-preview>
+                        <umb-node-preview icon="'icon-document'" name="entry.overlayView"></umb-node-preview>
                         <div class="cell-actions">
                             <button type="button" class="btn-reset cell-actions-btn --remove umb-outline" ng-click="vm.requestRemoveViewForEntry(entry)">
                                 <i class="icon icon-wrong"></i>
                             </button>
                         </div>
                     </div>
-                    <button type="button" class="btn-reset settings-input --noValue umb-outline" ng-if="entry.view === null" ng-click="vm.addViewForEntry(entry)">
+                    <button type="button" class="btn-reset settings-input --noValue umb-outline" ng-if="entry.overlayView === null" ng-click="vm.addViewForEntry(entry)">
                         <localize key="blockEditor_addCustomView">Add custom view</localize>
                     </button>
                 </div>
diff --git a/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs b/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
index f069804348..f76612db59 100644
--- a/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
@@ -35,8 +35,8 @@ namespace Umbraco.Web.PropertyEditors
             [JsonProperty("settingsElementTypeAlias")]
             public string SettingsElementTypeAlias { get; set; }
 
-            [JsonProperty("view")]
-            public string View { get; set; }
+            [JsonProperty("overlayView")]
+            public string OverlayView { get; set; }
 
             [JsonProperty("label")]
             public string Label { get; set; }