Merge pull request #1925 from atmire/w2p-96078_Fix-span-linebreak-issue

Minor fixes related to line breaks & Markdown in metadata fields
This commit is contained in:
Tim Donohue
2022-10-28 15:12:24 -05:00
committed by GitHub
4 changed files with 13 additions and 9 deletions

View File

@@ -1,18 +1,16 @@
<ds-metadata-field-wrapper [label]="label | translate">
<ng-container *ngFor="let mdValue of mdValues; let last=last;">
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value, classes: 'dont-break-out preserve-line-breaks'}">
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value}">
</ng-container>
<span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
</ng-container>
</ds-metadata-field-wrapper>
<ng-template #markdown let-value="value" let-classes="classes">
<span class="{{classes}}" [innerHTML]="value | dsMarkdown | async">
<ng-template #markdown let-value="value">
<span class="dont-break-out" [innerHTML]="value | dsMarkdown | async">
</span>
</ng-template>
<ng-template #simple let-value="value" let-classes="classes">
<span class="{{classes}}">
{{value}}
</span>
<ng-template #simple let-value="value">
<span class="dont-break-out preserve-line-breaks">{{value}}</span>
</ng-template>

View File

@@ -35,4 +35,10 @@ export class GenericItemPageFieldComponent extends ItemPageFieldComponent {
*/
@Input() label: string;
/**
* Whether the {@link MarkdownPipe} should be used to render this metadata.
*/
@Input() enableMarkdown = false;
}

View File

@@ -76,7 +76,7 @@
<ds-generic-item-page-field [item]="object"
[fields]="['dc.subject']"
[separator]="','"
[separator]="', '"
[label]="'item.page.subject'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"

View File

@@ -61,7 +61,7 @@
<ds-generic-item-page-field [item]="object"
[fields]="['dc.subject']"
[separator]="','"
[separator]="', '"
[label]="'item.page.subject'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"