Merge pull request #404 from leekelleher/hotfix/5.0.1

Preparing v5.0.1 release
leekelleher · Jun 9, 2024 · 7eeae46 · 7eeae46
2 parents 30661c9 + 2c5e415
commit 7eeae46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.0
+5.0.1
diff --git a/src/Umbraco.Community.Contentment/DataEditors/DataPicker/data-picker.js b/src/Umbraco.Community.Contentment/DataEditors/DataPicker/data-picker.js
@@ -49,11 +49,7 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
                 config.currentPageId = -1;
             }
 
-            $scope.model.value = $scope.model.value || config.defaultValue;
-
-            if (Array.isArray($scope.model.value) === false) {
-                $scope.model.value = [$scope.model.value];
-            }
+            ensureValueIsArray();
 
             if (Array.isArray(config.displayMode) === true) {
                 config.displayMode = config.displayMode[0];
@@ -120,6 +116,8 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
                 },
                 submit: function (selection) {
 
+                    ensureValueIsArray();
+
                     if (selection) {
                         Object.entries(selection).forEach(item => {
                             vm.itemLookup[item[0]] = item[1];
@@ -141,6 +139,14 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
             });
         };
 
+        function ensureValueIsArray() {
+            $scope.model.value = $scope.model.value || config.defaultValue;
+
+            if (Array.isArray($scope.model.value) === false) {
+                $scope.model.value = [$scope.model.value];
+            }
+        }
+
         function load() {
             if ($scope.model.value.length) {
                 vm.loading = true;

diff --git a/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj b/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj
@@ -14,7 +14,7 @@
         <Product>Umbraco.Community.Contentment</Product>
         <Title>Contentment for Umbraco</Title>
         <Description>Contentment, a collection of components for Umbraco.</Description>
-        <Version>5.0.0</Version>
+        <Version>5.0.1</Version>
         <Authors>Lee Kelleher</Authors>
         <Company>Lee Kelleher</Company>
         <Copyright>$([System.DateTime]::Now.Year) © $(Company)</Copyright>
@@ -47,8 +47,9 @@
 
     <ItemGroup>
         <Compile Remove="node_modules\**;wwwroot\**" />
+        <Content Remove="package.json;package-lock.json" />
         <EmbeddedResource Remove="node_modules\**;wwwroot\**" />
-        <None Remove="node_modules\**;wwwroot\**" />
+        <None Remove="node_modules\**;wwwroot\**;package.json;package-lock.json" />
     </ItemGroup>
 
     <Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">