Skip to content

Commit 19f1720

Browse files
rickbutterfieldrickbutterfield
committed
Fixes #127 
1 parent 68a4334 commit 19f1720

33 files changed

+190
-188
lines changed

‎.github/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ The Umbraco 10.4+ version of this package is [available via NuGet](https://www.n
2525
To install the package, you can use either .NET CLI:
2626

2727
```
28-
dotnet add package Umbraco.Community.BlockPreview --version 1.13.6
28+
dotnet add package Umbraco.Community.BlockPreview --version 1.13.7
2929
```
3030

3131
or the older NuGet Package Manager:
3232

3333
```
34-
Install-Package Umbraco.Community.BlockPreview -Version 1.13.6
34+
Install-Package Umbraco.Community.BlockPreview -Version 1.13.7
3535
```
3636

3737
### Setup

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.13.6
1+
1.13.7

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<ItemGroup>
1919
<PackageReference Include="Diplo.GodMode" Version="13.1.0" />
2020
<PackageReference Include="Umbraco.BlockGrid.Example.Website" Version="1.0.2" />
21-
<PackageReference Include="Umbraco.Cms" Version="13.9.2" />
22-
<PackageReference Include="uSync" Version="13.2.6" />
21+
<PackageReference Include="Umbraco.Cms" Version="13.10.0" />
22+
<PackageReference Include="uSync" Version="13.3.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/Umbraco.Cms.13.x/ViewComponents/HeroBlockViewComponent.cs renamed to ‎src/Umbraco.Cms.13.x/ViewComponents/HeroBlockComponent.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
namespace Umbraco.Cms._13.x.ViewComponents
66
{
7-
public class HeroBlockViewComponent : ViewComponent
7+
[ViewComponent(Name = HeroBlock.ModelTypeAlias)]
8+
public class HeroBlockComponent : ViewComponent
89
{
910
public IViewComponentResult Invoke(BlockGridItem<HeroBlock, BlockSettings> model)
1011
{

‎src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/oneColumnSectionBlock.cshtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@
1111
@(noBackgroundColor ? "nobackgroundcolor" : null)
1212
@(hasBrightContrast ? "bright-contrast" : null)>
1313
@await Html.GetPreviewBlockGridItemAreasHtmlAsync(Model)
14-
</section>
15-
16-
@await Html.GetBlockGridHtmlAsync(Model.Content.NestedBlockGrid)
14+
</section>

‎src/Umbraco.Cms.13.x/umbraco/models/Accordion.generated.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v13.8.0+a486d5d
5+
// Umbraco.ModelsBuilder.Embedded v13.10.0+c2890e1
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class Accordion : PublishedElementModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
2828
public new const string ModelTypeAlias = "accordion";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Accordion, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,7 +52,7 @@ public Accordion(IPublishedElement content, IPublishedValueFallback publishedVal
5252
///<summary>
5353
/// Accordion Items
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
5656
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
5757
[ImplementPropertyType("accordionItems")]
5858
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockListModel AccordionItems => this.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockListModel>(_publishedValueFallback, "accordionItems");

‎src/Umbraco.Cms.13.x/umbraco/models/AccordionItem.generated.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v13.8.0+a486d5d
5+
// Umbraco.ModelsBuilder.Embedded v13.10.0+c2890e1
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class AccordionItem : PublishedElementModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
2828
public new const string ModelTypeAlias = "accordionItem";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<AccordionItem, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,15 +52,15 @@ public AccordionItem(IPublishedElement content, IPublishedValueFallback publishe
5252
///<summary>
5353
/// Block Content
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
5656
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
5757
[ImplementPropertyType("blockContent")]
5858
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel BlockContent => this.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel>(_publishedValueFallback, "blockContent");
5959

6060
///<summary>
6161
/// Title
6262
///</summary>
63-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
63+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
6464
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
6565
[ImplementPropertyType("title")]
6666
public virtual string Title => this.Value<string>(_publishedValueFallback, "title");

‎src/Umbraco.Cms.13.x/umbraco/models/BlockGrid.generated.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v13.8.0+a486d5d
5+
// Umbraco.ModelsBuilder.Embedded v13.10.0+c2890e1
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class BlockGrid : PublishedContentModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
2828
public new const string ModelTypeAlias = "blockGrid";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<BlockGrid, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,7 +52,7 @@ public BlockGrid(IPublishedContent content, IPublishedValueFallback publishedVal
5252
///<summary>
5353
/// Content
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
5656
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
5757
[ImplementPropertyType("content")]
5858
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel Content => this.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockGridModel>(_publishedValueFallback, "content");

‎src/Umbraco.Cms.13.x/umbraco/models/BlockList.generated.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v13.8.0+a486d5d
5+
// Umbraco.ModelsBuilder.Embedded v13.10.0+c2890e1
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class BlockList : PublishedContentModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
2828
public new const string ModelTypeAlias = "blockList";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<BlockList, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,7 +52,7 @@ public BlockList(IPublishedContent content, IPublishedValueFallback publishedVal
5252
///<summary>
5353
/// Content
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
5656
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
5757
[ImplementPropertyType("content")]
5858
public virtual global::Umbraco.Cms.Core.Models.Blocks.BlockListModel Content => this.Value<global::Umbraco.Cms.Core.Models.Blocks.BlockListModel>(_publishedValueFallback, "content");

‎src/Umbraco.Cms.13.x/umbraco/models/BlockSettings.generated.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was generated by a tool.
44
//
5-
// Umbraco.ModelsBuilder.Embedded v13.8.0+a486d5d
5+
// Umbraco.ModelsBuilder.Embedded v13.10.0+c2890e1
66
//
77
// Changes to this file will be lost if the code is regenerated.
88
// </auto-generated>
@@ -24,15 +24,15 @@ public partial class BlockSettings : PublishedElementModel
2424
{
2525
// helpers
2626
#pragma warning disable 0109 // new is redundant
27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
2828
public new const string ModelTypeAlias = "blockSettings";
29-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
29+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3030
public new const PublishedItemType ModelItemType = PublishedItemType.Content;
31-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
31+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3232
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3333
public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
3434
=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
35-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
35+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
3636
[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
3737
public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<BlockSettings, TValue>> selector)
3838
=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -52,7 +52,7 @@ public BlockSettings(IPublishedElement content, IPublishedValueFallback publishe
5252
///<summary>
5353
/// Dropdown
5454
///</summary>
55-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.8.0+a486d5d")]
55+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder.Embedded", "13.10.0+c2890e1")]
5656
[global::System.Diagnostics.CodeAnalysis.MaybeNull]
5757
[ImplementPropertyType("dropdown")]
5858
public virtual string Dropdown => this.Value<string>(_publishedValueFallback, "dropdown");

0 commit comments

Comments
 (0)