Merge pull request #8 from umco/develop

Preparing v1.0.2 release
umco · Aug 29, 2018 · 08d9c34 · 08d9c34
2 parents 688fac6 + 49b945e
commit 08d9c34
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 43 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for personal support requests (use
-  [Our Umbraco](https://our.umbraco.org/projects/backoffice-extensions/simple-content/simple-content-feedback) or Twitter).
+  [Our Umbraco](https://our.umbraco.org/projects/backoffice-extensions/content-list/content-list-feedback) or Twitter).
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 1.0.1.{build}
+version: 1.0.2.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

diff --git a/build/install.ps1 b/build/install.ps1
@@ -13,7 +13,7 @@ if (!$contentFolder)
 	$projectPathExists = Test-Path $projectPath
 
 	if ($projectPathExists) {
-		Write-Host "Updating Simple Content App_Plugin files using PS as they have been excluded from the project"
+		Write-Host "Updating Content List App_Plugin files using PS as they have been excluded from the project"
 		Copy-Item $newPackageFiles $projectPath -Recurse -Force
 	}
 }
diff --git a/build/package.nuspec b/build/package.nuspec
@@ -16,7 +16,7 @@
 		<language></language>
 		<tags></tags>
 		<dependencies>
-			<dependency id="Our.Umbraco.InnerContent" version="[2,3)" />
+			<dependency id="Our.Umbraco.InnerContent" version="[2.0.1,3)" />
 		</dependencies>
 	</metadata>
 	<files />

diff --git a/src/Our.Umbraco.ContentList/Our.Umbraco.ContentList.csproj b/src/Our.Umbraco.ContentList/Our.Umbraco.ContentList.csproj
@@ -42,8 +42,8 @@
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Our.Umbraco.InnerContent, Version=2.0.6775.8222, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Our.Umbraco.InnerContent.Core.2.0.0\lib\net45\Our.Umbraco.InnerContent.dll</HintPath>
+    <Reference Include="Our.Umbraco.InnerContent, Version=2.0.6800.22164, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Our.Umbraco.InnerContent.Core.2.0.1\lib\net45\Our.Umbraco.InnerContent.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/Our.Umbraco.ContentList/PropertyEditors/ContentListPropertyEditor.cs b/src/Our.Umbraco.ContentList/PropertyEditors/ContentListPropertyEditor.cs
@@ -5,13 +5,14 @@
 
 namespace Our.Umbraco.ContentList.PropertyEditors
 {
-    [PropertyEditor(PropertyEditorAlias, PropertyEditorName, PropertyEditorValueTypes.Json, PropertyEditorViewPath, Group = "rich content", Icon = "icon-page-add")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, "~/App_Plugins/ContentList/contentlist.js")]
+    [PropertyEditor(PropertyEditorAlias, PropertyEditorName, PropertyEditorValueTypes.Json, PropertyEditorViewPath, Group = "lists", Icon = "icon-page-add")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, PropertyEditorJsPath)]
     public class ContentListPropertyEditor : SimpleInnerContentPropertyEditor
     {
         public const string PropertyEditorAlias = "Our.Umbraco.ContentList";
         public const string PropertyEditorName = "Content List";
         public const string PropertyEditorViewPath = "~/App_Plugins/ContentList/contentlist.html";
+        public const string PropertyEditorJsPath = "~/App_Plugins/ContentList/contentlist.js";
 
         public ContentListPropertyEditor()
             : base()
@@ -20,11 +21,6 @@ public ContentListPropertyEditor()
             DefaultPreValues.Add("hideLabel", "0");
         }
 
-        protected override PropertyValueEditor CreateValueEditor()
-        {
-            return new SimpleInnerContentPropertyValueEditor(base.CreateValueEditor());
-        }
-
         protected override PreValueEditor CreatePreValueEditor()
         {
             return new ContentListPreValueEditor();
@@ -35,27 +31,8 @@ internal class ContentListPreValueEditor : SimpleInnerContentPreValueEditor
             public ContentListPreValueEditor()
                 : base()
             {
-                // TODO: Once InnerContent exposes these extension methods, (in v2.0.1), uncomment the following lines. [LK:2018-07-20]
-                ////Fields.Add("maxItems", "Max Items", "number", "Set the maximum number of items allowed.");
-                ////Fields.AddHideLabel();
-
-                Fields.AddRange(new[]
-                {
-                    new PreValueField
-                    {
-                        Key = "maxItems",
-                        Name = "Max Items",
-                        View = "number",
-                        Description = "Set the maximum number of items allowed."
-                    },
-                    new PreValueField
-                    {
-                        Key = "hideLabel",
-                        Name = "Hide Label",
-                        View = "boolean",
-                        Description = "Set whether to hide the editor label and have the list take up the full width of the editor window."
-                    }
-                });
+                Fields.Add("maxItems", "Max Items", "number", "Set the maximum number of items allowed.");
+                Fields.AddHideLabel();
             }
         }
     }

diff --git a/src/Our.Umbraco.ContentList/Web/UI/App_Plugins/ContentList/contentlist.html b/src/Our.Umbraco.ContentList/Web/UI/App_Plugins/ContentList/contentlist.html
@@ -9,7 +9,7 @@
                           sortable="vm.sortable"
                           allow-remove="vm.allowRemove"
                           allow-edit="vm.allowEdit"
-                          on-remove="vm.remove($index, model.value)"
+                          on-remove="vm.remove($index)"
                           on-edit="vm.edit($event, $index, item)">
         </umb-node-preview>
     </div>

diff --git a/src/Our.Umbraco.ContentList/Web/UI/App_Plugins/ContentList/contentlist.js b/src/Our.Umbraco.ContentList/Web/UI/App_Plugins/ContentList/contentlist.js
@@ -63,20 +63,20 @@
         vm.edit = edit;
         vm.remove = remove;
 
-        function add(evt) {
-            vm.overlayConfig.event = evt;
+        function add($event) {
+            vm.overlayConfig.event = $event;
             vm.overlayConfig.data = { model: null, idx: $scope.model.value.length, action: "add" };
             vm.overlayConfig.show = true;
         };
 
-        function edit(evt, idx, itm) {
-            vm.overlayConfig.event = evt;
-            vm.overlayConfig.data = { model: itm, idx: idx, action: "edit" };
+        function edit($event, $index, item) {
+            vm.overlayConfig.event = $event;
+            vm.overlayConfig.data = { model: item, idx: $index, action: "edit" };
             vm.overlayConfig.show = true;
         };
 
-        function remove(evt, idx) {
-            $scope.model.value.splice(idx, 1);
+        function remove($index) {
+            $scope.model.value.splice($index, 1);
 
             if ($scope.model.config.maxItems === "0" || $scope.model.value.length < $scope.model.config.maxItems) {
                 vm.allowAdd = true;

diff --git a/src/Our.Umbraco.ContentList/packages.config b/src/Our.Umbraco.ContentList/packages.config
@@ -31,7 +31,7 @@
   <package id="MiniProfiler" version="2.1.0" targetFramework="net452" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
-  <package id="Our.Umbraco.InnerContent.Core" version="2.0.0" targetFramework="net452" />
+  <package id="Our.Umbraco.InnerContent.Core" version="2.0.1" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="semver" version="1.1.2" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />