yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issues with embed serialization + view

Browse Source 
added missing view for grid media
+ Fixed null issues in js
This commit is contained in:
Bjarke Berg
2021-02-05 18:41:52 +01:00
parent 7949f12377
commit 7c4982a04d
5 changed files with 125 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
View File

@@ -1,5 +1,5 @@
@using Umbraco.Core
@model dynamic
@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@{
string embedValue = Convert.ToString(Model.value);

61
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml Normal file
View File

@@ -0,0 +1,61 @@
@model dynamic
@using Umbraco.Core.PropertyEditors.ValueConverters
@using Umbraco.Core.Media
@inject IImageUrlGenerator ImageUrlGenerator
@if (Model.value != null)
{
var url = Model.value.image;
if(Model.editor.config != null && Model.editor.config.size != null){
if (Model.value.coordinates != null)
{
url = ImageCropperTemplateCoreExtensions.GetCropUrl(
(string)url,
ImageUrlGenerator,
width: (int)Model.editor.config.size.width,
height: (int)Model.editor.config.size.height,
cropAlias: "default",
cropDataSet: new ImageCropperValue
{
Crops = new[]
{
new ImageCropperValue.ImageCropperCrop
{
Alias = "default",
Coordinates = new ImageCropperValue.ImageCropperCropCoordinates
{
X1 = (decimal)Model.value.coordinates.x1,
Y1 = (decimal)Model.value.coordinates.y1,
X2 = (decimal)Model.value.coordinates.x2,
Y2 = (decimal)Model.value.coordinates.y2
}
}
}
});
}
else
{
url = ImageCropperTemplateCoreExtensions.GetCropUrl(
(string)url,
ImageUrlGenerator,
width: (int)Model.editor.config.size.width,
height: (int)Model.editor.config.size.height,
cropDataSet: new ImageCropperValue
{
FocalPoint = new ImageCropperValue.ImageCropperFocalPoint
{
Top = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.top,
Left = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.left
}
});
}
}
var altText = Model.value.altText ?? Model.value.caption ?? string.Empty;
<img src="@url" alt="@altText">
if (Model.value.caption != null)
{
<p class="caption">@Model.value.caption</p>
}
}