From 642dba8e9c9acb61bc802cfc458996debc8439ae Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Tue, 3 Jan 2023 16:48:42 +0100
Subject: [PATCH] bla
---
.../compound-elements/cloze/cloze.component.ts | 13 +++++++------
.../input-elements/drop-list.component.ts | 8 ++++----
.../input-groups/drop-list-properties.component.ts | 6 ------
projects/editor/src/assets/i18n/de.json | 1 -
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/projects/common/components/compound-elements/cloze/cloze.component.ts b/projects/common/components/compound-elements/cloze/cloze.component.ts
index c16fb3c92..0b934f07a 100644
--- a/projects/common/components/compound-elements/cloze/cloze.component.ts
+++ b/projects/common/components/compound-elements/cloze/cloze.component.ts
@@ -158,11 +158,11 @@ import { ClozeElement } from 'common/models/elements/compound-elements/cloze/clo
<aspect-compound-child-overlay
*ngIf="['ToggleButton', 'DropList', 'TextField', 'Button'] | arrayIncludes:subPart.type"
[style.display]="'inline-block'"
- [style.vertical-align]="'top'"
- [parentForm]="parentForm"
- [element]="$any(subPart).attrs.model"
- [editorMode]="editorMode"
- (elementSelected)="childElementSelected.emit($event)">
+ [class.droplist-child]="subPart.type == 'DropList'"
+ [parentForm]="parentForm"
+ [element]="$any(subPart).attrs.model"
+ [editorMode]="editorMode"
+ (elementSelected)="childElementSelected.emit($event)">
</aspect-compound-child-overlay>
</ng-container>
</ng-template>
@@ -175,7 +175,8 @@ import { ClozeElement } from 'common/models/elements/compound-elements/cloze/clo
':host ::ng-deep p strong {letter-spacing: 0.04em; font-weight: 600;}', // bold less bold
':host ::ng-deep p:empty::after {content: "\\00A0"}', // render empty p
'p span {font-size: inherit}',
- 'sup, sub {line-height: 0;}'
+ 'sup, sub {line-height: 0;}',
+ '.droplist-child {vertical-align: middle;}'
]
})
export class ClozeComponent extends CompoundElementComponent {
diff --git a/projects/common/components/input-elements/drop-list.component.ts b/projects/common/components/input-elements/drop-list.component.ts
index 10a66e32b..bad09ad6f 100644
--- a/projects/common/components/input-elements/drop-list.component.ts
+++ b/projects/common/components/input-elements/drop-list.component.ts
@@ -18,6 +18,7 @@ import { FormElementComponent } from '../../directives/form-element-component.di
[class.vertical-orientation]="elementModel.orientation === 'vertical'"
[class.horizontal-orientation]="elementModel.orientation === 'horizontal'"
[class.floating-orientation]="elementModel.orientation === 'flex'"
+ [class.only-one-item]="elementModel.onlyOneItem"
[class.highlight-receiver]="classReference.highlightReceivingDropList"
cdkDropList
[cdkDropListData]="this" [cdkDropListConnectedTo]="elementModel.connectedTo"
@@ -73,19 +74,18 @@ import { FormElementComponent } from '../../directives/form-element-component.di
'.list.vertical-orientation {flex-direction: column;}',
'.list.horizontal-orientation {flex-direction: row;}',
'.list.floating-orientation {place-content: center space-around; align-items: center; flex-flow: row wrap;}',
+ '.cloze-context.list {padding: 0;}',
'.list-item {border-radius: 5px;}',
':not(.cloze-context) .list-item {padding: 10px;}',
'.cloze-context .list-item {padding: 0 5px;}',
- '.cloze-context.list {padding: 0;}',
+ '.cloze-context .list-item span {margin-bottom: 3px;}',
+ '.only-one-item .list-item {height: 100%; display: flex; align-items: center; justify-content: center;}',
'img.list-item {align-self: start;}',
'.errors {border: 2px solid #f44336 !important;}',
'.error-message {font-size: 75%; margin-top: 10px; margin-left: 5px; position: absolute; pointer-events: none;}',
'.cloze-context-error-message {padding: 0 !important;}',
- '.list-item {cursor: grab;}',
'.list-item:active {cursor: grabbing;}',
-
'.cdk-drag-preview {border-radius: 5px; box-shadow: 2px 2px 5px black; padding: 10px;}',
-
'.cdk-drop-list-dragging .cdk-drag {transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);}',
'.highlight-receiver.cdk-drop-list-receiving {padding: 3px; border: 2px solid;}',
'.cdk-drag-placeholder {background: #ccc; border: dotted 3px #999; min-height: 25px; min-width: 25px;}',
diff --git a/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/drop-list-properties.component.ts b/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/drop-list-properties.component.ts
index debf12382..34f3d5f0f 100644
--- a/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/drop-list-properties.component.ts
+++ b/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/drop-list-properties.component.ts
@@ -50,12 +50,6 @@ import { DialogService } from '../../../../services/dialog.service';
</mat-select>
</mat-form-field>
- <mat-checkbox *ngIf="combinedProperties.isSortList !== undefined"
- [checked]="$any(combinedProperties.isSortList)"
- (change)="updateModel.emit({ property: 'isSortList', value: $event.checked })">
- {{'propertiesPanel.isSortList' | translate }}
- </mat-checkbox>
-
<mat-checkbox *ngIf="combinedProperties.onlyOneItem !== undefined"
[checked]="$any(combinedProperties.onlyOneItem)"
(change)="updateModel.emit({ property: 'onlyOneItem', value: $event.checked })">
diff --git a/projects/editor/src/assets/i18n/de.json b/projects/editor/src/assets/i18n/de.json
index af2a25819..69ebe6be5 100644
--- a/projects/editor/src/assets/i18n/de.json
+++ b/projects/editor/src/assets/i18n/de.json
@@ -192,7 +192,6 @@
"newHotspot": "Neuer Bereich",
"hasDynamicRowCount": "Dynamische Zeilen",
"expectedCharactersCount": "Erwartete Zeichenanzahl",
- "isSortList": "Sortierliste",
"deleteDroppedItemWithSameID": "Zurücklegen erlauben",
"deleteDroppedItemWithSameIDTooltip": "Elemente mit gleicher ID werden beim Zurücklegen gelöscht.",
"setElementInteractionEnabled": "Elementinteraktion erlauben",
--
GitLab