Skip to content

Commit c876055

Browse files
authored
Merge pull request DSpace#1925 from atmire/w2p-96078_Fix-span-linebreak-issue
Minor fixes related to line breaks & Markdown in metadata fields
2 parents 2b666a1 + 6918239 commit c876055

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<ds-metadata-field-wrapper [label]="label | translate">
22
<ng-container *ngFor="let mdValue of mdValues; let last=last;">
3-
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value, classes: 'dont-break-out preserve-line-breaks'}">
3+
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value}">
44
</ng-container>
55
<span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
66
</ng-container>
77
</ds-metadata-field-wrapper>
88

9-
<ng-template #markdown let-value="value" let-classes="classes">
10-
<span class="{{classes}}" [innerHTML]="value | dsMarkdown | async">
9+
<ng-template #markdown let-value="value">
10+
<span class="dont-break-out" [innerHTML]="value | dsMarkdown | async">
1111
</span>
1212
</ng-template>
1313

14-
<ng-template #simple let-value="value" let-classes="classes">
15-
<span class="{{classes}}">
16-
{{value}}
17-
</span>
14+
<ng-template #simple let-value="value">
15+
<span class="dont-break-out preserve-line-breaks">{{value}}</span>
1816
</ng-template>

src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,10 @@ export class GenericItemPageFieldComponent extends ItemPageFieldComponent {
3535
*/
3636
@Input() label: string;
3737

38+
/**
39+
* Whether the {@link MarkdownPipe} should be used to render this metadata.
40+
*/
41+
@Input() enableMarkdown = false;
42+
43+
3844
}

src/app/item-page/simple/item-types/publication/publication.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
<ds-generic-item-page-field [item]="object"
7878
[fields]="['dc.subject']"
79-
[separator]="','"
79+
[separator]="', '"
8080
[label]="'item.page.subject'">
8181
</ds-generic-item-page-field>
8282
<ds-generic-item-page-field [item]="object"

src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<ds-generic-item-page-field [item]="object"
6363
[fields]="['dc.subject']"
64-
[separator]="','"
64+
[separator]="', '"
6565
[label]="'item.page.subject'">
6666
</ds-generic-item-page-field>
6767
<ds-generic-item-page-field [item]="object"

0 commit comments

Comments
 (0)