Merge pull request #431 from leekelleher/dev/v5.x

Preparing v5.1.0 release

Author: leekelleher

.github/README.md

@@ -7,7 +7,7 @@
 [![Mozilla Public License](https://img.shields.io/badge/MPL--2.0-orange?label=license)](https://opensource.org/licenses/MPL-2) [![Latest version](https://img.shields.io/nuget/v/Umbraco.Community.Contentment?label=version)](https://marketplace.umbraco.com/package/umbraco.community.contentment) [![NuGet download count](https://img.shields.io/nuget/dt/Umbraco.Community.Contentment?label=downloads)](https://www.nuget.org/packages/Umbraco.Community.Contentment)
 
 > [!IMPORTANT]
-> If you are looking for **Contentment for Umbraco 14** (Bellissima, the new backoffice), [please see the latest progress updates](https://github.com/leekelleher/umbraco-contentment/discussions/357)!
+> If you are looking for **Contentment for Umbraco 15** (the new backoffice), [please see the latest progress updates](https://github.com/leekelleher/umbraco-contentment/discussions/357)!
 
 ### What is it?
 

.github/ROADMAP.md

@@ -140,7 +140,8 @@ Property Editors are:
 ## v6
 
 - [Support for the new Umbraco backoffice, aka Bellissima](https://github.com/leekelleher/umbraco-contentment/discussions/357).
-- Adds support for Umbraco 14 (.NET 8) _aka Bellissima_.
+- ~Adds support for Umbraco 14 (.NET 8) _aka Bellissima_~.
+- Adds support for Umbraco 15 (.NET 9).
 - Removes support for Umbraco 13 (.NET 8).
 
 

VERSION

@@ -1 +1 @@
-5.0.2
+5.1.0

src/Umbraco.Cms.13.x/Umbraco.Cms.13.x.csproj

@@ -11,8 +11,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="13.2.0" />
-        <PackageReference Include="uSync" Version="13.1.3" />
+        <PackageReference Include="Umbraco.Cms" Version="13.5.2" />
+        <PackageReference Include="uSync" Version="13.2.5" />
         <ProjectReference Include="..\Umbraco.Community.Contentment\Umbraco.Community.Contentment.csproj" />
     </ItemGroup>
 

src/Umbraco.Cms.13.x/appsettings-schema.usync.json

@@ -147,6 +147,10 @@
           "description": "Should the history view be on of off ? ",
           "default": true
         },
+        "HistoryFolder": {
+          "type": "string",
+          "description": "Location of the history folder."
+        },
         "DefaultExtension": {
           "type": "string",
           "description": "Default file extension for the uSync files. ",

src/Umbraco.Community.Contentment.sln

@@ -64,7 +64,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visual Studio", "Visual Studio", "{7E3CB058-A757-42C9-9277-EB949E1D7D0E}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		Umbraco.Community.Contentment.sln.licenseheader = Umbraco.Community.Contentment.sln.licenseheader
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data Sources", "Data Sources", "{40B5A85D-28D1-4742-87E7-6306CC5F08C1}"

src/Umbraco.Community.Contentment.sln.licenseheader

@@ -1,11 +1,12 @@
-/* Copyright © 2020 Lee Kelleher.
+/* Copyright © 2020 Lee Kelleher.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.Buttons.Controller", [
     "$scope",
-    function ($scope) {
+    "eventsService",
+    function ($scope, eventsService) {
 
         // console.log("buttons.model", $scope.model);
 
@@ -79,6 +80,21 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
                     $scope.umbProperty.setPropertyActions(vm.propertyActions);
                 }
             }
+
+            var events = [];
+
+            events.push(eventsService.on("contentment.update.value", (event, args) => {
+                if (args.alias === $scope.model.alias) {
+                    $scope.model.value = args.value;
+                    init();
+                }
+            }));
+
+            $scope.$on("$destroy", () => {
+                for (var event in events) {
+                    eventsService.unsubscribe(events[event]);
+                }
+            });
         };
 
         function clear() {

src/Umbraco.Community.Contentment/DataEditors/Buttons/buttons.js

@@ -1,12 +1,13 @@
-/* Copyright © 2019 Lee Kelleher.
+/* Copyright © 2019 Lee Kelleher.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.CheckboxList.Controller", [
     "$scope",
+    "eventsService",
     "localizationService",
-    function ($scope, localizationService) {
+    function ($scope, eventsService, localizationService) {
 
         // console.log("checkboxlist.model", $scope.model);
 
@@ -60,6 +61,21 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
                 vm.toggle = toggle;
                 vm.toggleChecked = vm.items.every(item => item.checked);
             }
+
+            var events = [];
+
+            events.push(eventsService.on("contentment.update.value", (event, args) => {
+                if (args.alias === $scope.model.alias) {
+                    $scope.model.value = args.value;
+                    init();
+                }
+            }));
+
+            $scope.$on("$destroy", () => {
+                for (var event in events) {
+                    eventsService.unsubscribe(events[event]);
+                }
+            });
         };
 
         function changed(item) {

src/Umbraco.Community.Contentment/DataEditors/CheckboxList/checkbox-list.js

@@ -1,4 +1,4 @@
-/* Copyright © 2019 Lee Kelleher.
+/* Copyright © 2019 Lee Kelleher.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -65,11 +65,11 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
 
                     config.expressions[item.key] = {};
 
-                    if (item.nameTemplate) { // TODO: [LK:2022-07-05] Deprecated.
+                    if (item.nameTemplate) {
                         config.expressions[item.key]["name"] = $interpolate(item.nameTemplate);
                     }
 
-                    if (item.descriptionTemplate) { // TODO: [LK:2022-07-05] Deprecated.
+                    if (item.descriptionTemplate) {
                         config.expressions[item.key]["description"] = $interpolate(item.descriptionTemplate);
                     }