Skip to content
Snippets Groups Projects
Commit 0abe0286 authored by rhenck's avatar rhenck
Browse files

Fix GeoGebra cutomToolbar property to have consistent naming

Toolbar is a single word, therefore any capitalized letters are errors. 
No need to sanitize, since this was broken anyway.

#384
parent 981a05f8
No related branches found
No related tags found
No related merge requests found
Pipeline #47882 failed
...@@ -96,7 +96,7 @@ export class GeometryComponent extends ElementComponent implements AfterViewInit ...@@ -96,7 +96,7 @@ export class GeometryComponent extends ElementComponent implements AfterViewInit
enableShiftDragZoom: this.elementModel.enableShiftDragZoom, enableShiftDragZoom: this.elementModel.enableShiftDragZoom,
showZoomButtons: this.elementModel.showZoomButtons, showZoomButtons: this.elementModel.showZoomButtons,
showFullscreenButton: this.elementModel.showFullscreenButton, showFullscreenButton: this.elementModel.showFullscreenButton,
customToolBar: this.elementModel.customToolBar, customToolBar: this.elementModel.customToolbar,
enableUndoRedo: this.elementModel.enableUndoRedo, enableUndoRedo: this.elementModel.enableUndoRedo,
showResetIcon: false, // use custom html button icon showResetIcon: false, // use custom html button icon
showMenuBar: false, showMenuBar: false,
......
...@@ -16,7 +16,7 @@ export class GeometryElement extends UIElement implements PositionedUIElement { ...@@ -16,7 +16,7 @@ export class GeometryElement extends UIElement implements PositionedUIElement {
enableShiftDragZoom: boolean = true; enableShiftDragZoom: boolean = true;
showZoomButtons: boolean = true; showZoomButtons: boolean = true;
showFullscreenButton: boolean = true; showFullscreenButton: boolean = true;
customToolBar: string = ''; customToolbar: string = '';
position: PositionProperties; position: PositionProperties;
constructor(element: Partial<GeometryElement>) { constructor(element: Partial<GeometryElement>) {
...@@ -30,7 +30,7 @@ export class GeometryElement extends UIElement implements PositionedUIElement { ...@@ -30,7 +30,7 @@ export class GeometryElement extends UIElement implements PositionedUIElement {
this.enableShiftDragZoom = element.enableShiftDragZoom !== undefined ? element.enableShiftDragZoom : true; this.enableShiftDragZoom = element.enableShiftDragZoom !== undefined ? element.enableShiftDragZoom : true;
this.showZoomButtons = element.showZoomButtons !== undefined ? element.showZoomButtons : true; this.showZoomButtons = element.showZoomButtons !== undefined ? element.showZoomButtons : true;
this.showFullscreenButton = element.showFullscreenButton !== undefined ? element.showFullscreenButton : true; this.showFullscreenButton = element.showFullscreenButton !== undefined ? element.showFullscreenButton : true;
this.customToolBar = element.customToolBar !== undefined ? element.customToolBar : ''; this.customToolbar = element.customToolbar !== undefined ? element.customToolbar : '';
this.position = UIElement.initPositionProps({ ...element.position }); this.position = UIElement.initPositionProps({ ...element.position });
} }
......
...@@ -209,12 +209,12 @@ ...@@ -209,12 +209,12 @@
{{'propertiesPanel.showFullscreenButton' | translate }} {{'propertiesPanel.showFullscreenButton' | translate }}
</mat-checkbox> </mat-checkbox>
<mat-form-field *ngIf="combinedProperties.customToolBar != null" <mat-form-field *ngIf="combinedProperties.customToolbar != null"
matTooltip="{{'propertiesPanel.customToolbarHelp' | translate }}" matTooltip="{{'propertiesPanel.customToolbarHelp' | translate }}"
appearance="fill"> appearance="fill">
<mat-label>{{'propertiesPanel.customToolbar' | translate }}</mat-label> <mat-label>{{'propertiesPanel.customToolbar' | translate }}</mat-label>
<input matInput [value]="$any(combinedProperties.customToolbar)" <input matInput [value]="$any(combinedProperties.customToolbar)"
(input)="updateModel.emit({ property: 'customToolBar', value: $any($event.target).value })"> (input)="updateModel.emit({ property: 'customToolbar', value: $any($event.target).value })">
</mat-form-field> </mat-form-field>
<mat-checkbox *ngIf="combinedProperties.enableModeSwitch !== undefined" <mat-checkbox *ngIf="combinedProperties.enableModeSwitch !== undefined"
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
"showZoomButtons": "Zoom-Knöpfe anzeigen", "showZoomButtons": "Zoom-Knöpfe anzeigen",
"showFullscreenButton": "Vollbild-Knopf anzeigen", "showFullscreenButton": "Vollbild-Knopf anzeigen",
"enableShiftDragZoom": "Bewegen und Zoom erlauben", "enableShiftDragZoom": "Bewegen und Zoom erlauben",
"customToolBar": "Anpassung Werkzeugleiste", "customToolbar": "Anpassung Werkzeugleiste",
"customToolbarHelp": "Hier kann definiert werden, welche Elemente auf der Werkzeigleiste angezeigt werden sollen. Für Details bitte die Dokumentation konsultieren.", "customToolbarHelp": "Hier kann definiert werden, welche Elemente auf der Werkzeigleiste angezeigt werden sollen. Für Details bitte die Dokumentation konsultieren.",
"hotspots": "Aktive Bereiche", "hotspots": "Aktive Bereiche",
"newHotspot": "Neuer Bereich", "newHotspot": "Neuer Bereich",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment