From e940f6dfdc166084a30b95e3d209ed83010cce70 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 9 Aug 2019 12:43:21 +1000 Subject: [PATCH] adds notes, starting to remove directives since these don't make sense in this context --- .../blockeditor/umbblockeditor.directive.js | 2 ++ .../blockeditor/umbblockeditorblock.directive.js | 13 ------------- .../blockeditor.editcontent.controller.js | 11 ++++++++++- .../blockeditor.editsettings.controller.js | 12 +++++++++++- .../propertyeditors/blockeditor/blockeditor.html | 5 ++++- .../blockeditor/blockeditor.simplelist.block.html | 12 ------------ .../blockeditor/blockeditor.simplelist.html | 13 ++++++++++++- 7 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditorblock.directive.js delete mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.block.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditor.directive.js index 5a7e6193f8..9549b05036 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditor.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditor.directive.js @@ -174,6 +174,7 @@ angular.module("umbraco.directives").directive('umbBlockEditor', [ var options = { element: element, title: 'Edit block', + //fixme: This isn't really a component if its strongly tied to views in the property editor :/ view: "views/propertyeditors/blockeditor/blockeditor.editcontent.html", submit: function (model) { _.each(element.variants[0].tabs, function (tab) { @@ -199,6 +200,7 @@ angular.module("umbraco.directives").directive('umbBlockEditor', [ var options = { settings: block.settings, title: "Edit settings", + //fixme: This isn't really a component if its strongly tied to views in the property editor :/ view: "views/propertyeditors/blockeditor/blockeditor.editsettings.html", size: "small", submit: function (model) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditorblock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditorblock.directive.js deleted file mode 100644 index 4a29fd7ea7..0000000000 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/blockeditor/umbblockeditorblock.directive.js +++ /dev/null @@ -1,13 +0,0 @@ -//fixme: this needs to be component not a directive -angular.module("umbraco.directives").directive('umbBlockEditorBlock', [ - function () { - var link = function (scope, el, attr, ctrl) { - scope.view = scope.block.view || attr.view; - }; - return { - restrict: "E", - template: "
", - link: link - }; - } -]); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editcontent.controller.js index f05799b398..73eb392162 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editcontent.controller.js @@ -1,4 +1,13 @@ -function BlockEditorEditContentController($scope) { +/** + * @ngdoc controller + * @name Umbraco.PropertyEditors.BlockEditor.EditContentController + * @function + * + * @description + * The controller for editing content with the block editor + */ + +function BlockEditorEditContentController($scope) { var vm = this; vm.submit = submit; vm.close = close; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editsettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editsettings.controller.js index c0a91ce5c9..bb375d558b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editsettings.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.editsettings.controller.js @@ -1,4 +1,14 @@ -function BlockEditorEditSettingsController($scope) { +/** + * @ngdoc controller + * @name Umbraco.PropertyEditors.BlockEditor.EditSettingsController + * @function + * + * @description + * The controller for editing the configuration of an individual block + */ + +//fixme: Need to figure out the name of a block settings, is it block config or block settings? +function BlockEditorEditSettingsController($scope) { this.submit = () => { if($scope.model.submit) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.html index ea0f004006..bcaab4998f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.html @@ -1 +1,4 @@ - + + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.block.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.block.html deleted file mode 100644 index 544bd00edc..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.block.html +++ /dev/null @@ -1,12 +0,0 @@ -
- -
-
TODO: Figure out how to name a block
-
{{ block.description }}
-
-
- Edit - Settings - Remove -
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.html index 2e36a68dac..bb711683d0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockeditor/blockeditor.simplelist.html @@ -2,7 +2,18 @@