From df8fb169bd3e9a440fa637e2f11e6005946565ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 26 Jun 2020 12:28:43 +0200 Subject: [PATCH 01/22] rename files to match file name conventions --- src/Umbraco.Web.UI.Client/src/less/belle.less | 2 +- .../infiniteeditors/blockeditor/blockeditor.content.html | 1 + .../infiniteeditors/blockeditor/blockeditor.controller.js | 6 +++--- .../blockeditor.settings.html} | 0 .../elementeditor/elementeditor.content.html | 3 --- .../umb-element-editor-content.component.html} | 0 .../elementeditor/umbelementeditorcontent.component.js} | 2 +- .../src/views/propertyeditors/blocklist/blocklist.html | 2 +- ...block.component.js => umb-block-list-block.component.js} | 0 ...t.component.html => umb-block-list-property-editor.html} | 0 ...t.component.less => umb-block-list-property-editor.less} | 0 ...omponent.js => umb-block-list-scoped-block.component.js} | 2 ++ ...component.js => umbBlockListPropertyEditor.component.js} | 6 +++--- ...> umbBlockListPropertyEditor.createButton.controller.js} | 0 14 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html rename src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/{elementeditor/elementeditor.settings.html => blockeditor/blockeditor.settings.html} (100%) delete mode 100644 src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html rename src/Umbraco.Web.UI.Client/src/views/{common/infiniteeditors/elementeditor/elementEditor.content.component.html => components/elementeditor/umb-element-editor-content.component.html} (100%) rename src/Umbraco.Web.UI.Client/src/views/{common/infiniteeditors/elementeditor/elementEditor.content.component.js => components/elementeditor/umbelementeditorcontent.component.js} (80%) rename src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/{blocklist.block.component.js => umb-block-list-block.component.js} (100%) rename src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/{blocklist.component.html => umb-block-list-property-editor.html} (100%) rename src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/{blocklist.component.less => umb-block-list-property-editor.less} (100%) rename src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/{blocklist.scopedblock.component.js => umb-block-list-scoped-block.component.js} (90%) rename src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/{blocklist.component.js => umbBlockListPropertyEditor.component.js} (98%) rename src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/{blocklist.component.createButton.controller.js => umbBlockListPropertyEditor.createButton.controller.js} (100%) diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 445d87fbb9..91039fa62a 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -202,7 +202,7 @@ // Property Editors @import "../views/propertyeditors/blockeditor/blockcard/umb-block-card-grid.less"; @import "../views/propertyeditors/blockeditor/blockcard/blockcard.component.less"; -@import "../views/propertyeditors/blocklist/blocklist.component.less"; +@import "../views/propertyeditors/blocklist/umb-block-list-property-editor.less"; @import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less"; @import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less"; @import "../views/propertyeditors/notsupported/notsupported.less"; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html new file mode 100644 index 0000000000..15c3b9594f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html @@ -0,0 +1 @@ + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js index 08ffb4a9ae..e230d270a8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js @@ -28,7 +28,7 @@ angular.module("umbraco") // replace view of content app. var contentApp = apps.find(entry => entry.alias === "umbContent"); if(contentApp) { - contentApp.view = "views/common/infiniteeditors/elementeditor/elementeditor.content.html"; + contentApp.view = "views/common/infiniteeditors/blockeditor/blockeditor.content.html"; if($scope.model.hideContent) { apps.splice(apps.indexOf(contentApp), 1); } else if ($scope.model.openSettings !== true) { @@ -49,7 +49,7 @@ angular.module("umbraco") "name": settingsName, "alias": "settings", "icon": "icon-settings", - "view": "views/common/infiniteeditors/elementeditor/elementeditor.settings.html" + "view": "views/common/infiniteeditors/blockeditor/blockeditor.settings.html" }; vm.tabs.push(settingsTab); if ($scope.model.openSettings) { @@ -69,7 +69,7 @@ angular.module("umbraco") vm.close = function() { if ($scope.model && $scope.model.close) { - // TODO: If content has changed, we should notify user. + // TODO: check if content/settings has changed and ask user if they are sure. $scope.model.close($scope.model); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.settings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.settings.html rename to src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html deleted file mode 100644 index eb8c72c579..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementeditor.content.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.html b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.html rename to src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.js b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js similarity index 80% rename from src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.js rename to src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js index ccde5a3a73..6e4f2f42ae 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/elementeditor/elementEditor.content.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js @@ -4,7 +4,7 @@ angular .module('umbraco.directives') .component('umbElementEditorContent', { - templateUrl: 'views/common/infiniteeditors/elementeditor/elementEditor.content.component.html', + templateUrl: 'views/components/elementeditor/umb-element-editor-content.component.html', controller: ElementEditorContentComponentController, controllerAs: 'vm', bindings: { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html index eea9f01ff3..efadc4dfd6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html @@ -1 +1 @@ - + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.block.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-block.component.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.block.component.js rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-block.component.js diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.less rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.scopedblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js similarity index 90% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.scopedblock.component.js rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js index 1b95b904cb..492423c132 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.scopedblock.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-scoped-block.component.js @@ -6,6 +6,8 @@ * @name umbraco.directives.directive:umbBlockListScopedBlock * @description * The component for a style-scoped block of the block list property editor. + * Uses a ShadowDom to make a scoped element. + * This way the backoffice styling does not collide with the block style. */ angular 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/umbBlockListPropertyEditor.component.js similarity index 98% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js index 597f0bf588..fe1d8cbf6a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js @@ -4,7 +4,7 @@ /** * @ngdoc directive - * @name umbraco.directives.directive:blockListPropertyEditor + * @name umbraco.directives.directive:umbBlockListPropertyEditor * @function * * @description @@ -12,8 +12,8 @@ */ angular .module("umbraco") - .component("blockListPropertyEditor", { - templateUrl: "views/propertyeditors/blocklist/blocklist.component.html", + .component("umbBlockListPropertyEditor", { + templateUrl: "views/propertyeditors/blocklist/umb-block-list-property-editor.html", controller: BlockListController, controllerAs: "vm", bindings: { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.createButton.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.createButton.controller.js rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js From 3ae3aefde07760c760527b1a8254b5300583b6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 26 Jun 2020 12:28:58 +0200 Subject: [PATCH 02/22] this should not happen. --- .../common/directives/components/umbnestedcontent.directive.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js index 42035579d5..f9b26c81a5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js @@ -50,8 +50,6 @@ } }); - // Some property editors need to performe an action after all property editors have reacted to the formSubmitting. - $scope.$broadcast("postFormSubmitting", { scope: $scope }); } }); From 1a53a9c22d9aa49a08ea149cf3464da50eb37d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 26 Jun 2020 13:19:25 +0200 Subject: [PATCH 03/22] remove dublicated code --- .../blocklist/umbBlockListPropertyEditor.component.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js index fe1d8cbf6a..756b6ffde7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js @@ -387,10 +387,6 @@ }; - function requestCopyBlock(block) { - clipboardService.copy("elementTypeArray", block.content.contentTypeAlias, block.content, block.label); - } - var requestCopyAllBlocks = function() { var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(entry => entry.$block.content); From ac6d14a93adcc90319fcc07b875c0dbeb25f777a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 26 Jun 2020 13:45:01 +0200 Subject: [PATCH 04/22] rename requestCopyBlock to copyBlock --- .../blocklist/umb-block-list-property-editor.html | 2 +- .../blocklist/umbBlockListPropertyEditor.component.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html index 5f2737d263..753a1f776a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html @@ -32,7 +32,7 @@ Settings -