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

[editor] Return only touched values from Player-Dialog

All values returned are set. This way there are less useless calls.
parent 8df588d2
No related branches found
No related tags found
No related merge requests found
...@@ -139,56 +139,56 @@ export class RichTextEditDialog { ...@@ -139,56 +139,56 @@ export class RichTextEditDialog {
template: ` template: `
<mat-dialog-content fxLayout="row"> <mat-dialog-content fxLayout="row">
<div class="property-column" fxLayout="column"> <div class="property-column" fxLayout="column">
<mat-checkbox [checked]="newPlayerConfig.autostart" <mat-checkbox [checked]="newPlayerConfig.autostart || data.player.autostart"
(change)="newPlayerConfig.autostart = $event.checked"> (change)="newPlayerConfig.autostart = $event.checked">
Autostart Autostart
</mat-checkbox> </mat-checkbox>
<mat-form-field *ngIf="newPlayerConfig.autostart" appearance="fill"> <mat-form-field *ngIf="newPlayerConfig.autostart" appearance="fill">
<mat-label>Autostart Verzögerung</mat-label> <mat-label>Autostart Verzögerung</mat-label>
<input matInput type="number" [value]="newPlayerConfig.autostartDelay" <input matInput type="number" [value]="newPlayerConfig.autostartDelay || data.player.autostartDelay"
(input)="newPlayerConfig.autostartDelay = $any($event.target).value"> (input)="newPlayerConfig.autostartDelay = $any($event.target).value">
</mat-form-field> </mat-form-field>
<mat-checkbox [checked]="newPlayerConfig.loop" <mat-checkbox [checked]="newPlayerConfig.loop || data.player.loop"
(change)="newPlayerConfig.loop = $event.checked"> (change)="newPlayerConfig.loop = $event.checked">
Loop Loop
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.startControl" <mat-checkbox [checked]="newPlayerConfig.startControl || data.player.startControl"
(change)="newPlayerConfig.startControl = $event.checked"> (change)="newPlayerConfig.startControl = $event.checked">
startControl startControl
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.pauseControl" <mat-checkbox [checked]="newPlayerConfig.pauseControl || data.player.pauseControl"
(change)="newPlayerConfig.pauseControl = $event.checked"> (change)="newPlayerConfig.pauseControl = $event.checked">
pauseControl pauseControl
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.stopControl" <mat-checkbox [checked]="newPlayerConfig.stopControl || data.player.stopControl"
(change)="newPlayerConfig.stopControl = $event.checked"> (change)="newPlayerConfig.stopControl = $event.checked">
stopControl stopControl
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.progressBar" <mat-checkbox [checked]="newPlayerConfig.progressBar || data.player.progressBar"
(change)="newPlayerConfig.progressBar = $event.checked"> (change)="newPlayerConfig.progressBar = $event.checked">
progressBar progressBar
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.interactiveProgressbar" <mat-checkbox [checked]="newPlayerConfig.interactiveProgressbar || data.player.interactiveProgressbar"
(change)="newPlayerConfig.interactiveProgressbar = $event.checked"> (change)="newPlayerConfig.interactiveProgressbar = $event.checked">
interactiveProgressbar interactiveProgressbar
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.volumeControl" <mat-checkbox [checked]="newPlayerConfig.volumeControl || data.player.volumeControl"
(change)="newPlayerConfig.volumeControl = $event.checked"> (change)="newPlayerConfig.volumeControl = $event.checked">
volumeControl volumeControl
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.uninterruptible" <mat-checkbox [checked]="newPlayerConfig.uninterruptible || data.player.uninterruptible"
(change)="newPlayerConfig.uninterruptible = $event.checked"> (change)="newPlayerConfig.uninterruptible = $event.checked">
uninterruptible uninterruptible
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.hideOtherPages" <mat-checkbox [checked]="newPlayerConfig.hideOtherPages || data.player.hideOtherPages"
(change)="newPlayerConfig.hideOtherPages = $event.checked"> (change)="newPlayerConfig.hideOtherPages = $event.checked">
hideOtherPages hideOtherPages
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.showRestRuns" <mat-checkbox [checked]="newPlayerConfig.showRestRuns || data.player.showRestRuns"
(change)="newPlayerConfig.showRestRuns = $event.checked"> (change)="newPlayerConfig.showRestRuns = $event.checked">
showRestRuns showRestRuns
</mat-checkbox> </mat-checkbox>
<mat-checkbox [checked]="newPlayerConfig.showRestTime" <mat-checkbox [checked]="newPlayerConfig.showRestTime || data.player.showRestTime"
(change)="newPlayerConfig.showRestTime = $event.checked"> (change)="newPlayerConfig.showRestTime = $event.checked">
showRestTime showRestTime
</mat-checkbox> </mat-checkbox>
...@@ -196,7 +196,7 @@ export class RichTextEditDialog { ...@@ -196,7 +196,7 @@ export class RichTextEditDialog {
<div fxLayout="column"> <div fxLayout="column">
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>hintLabel</mat-label> <mat-label>hintLabel</mat-label>
<input matInput type="text" [value]="newPlayerConfig.hintLabel" <input matInput type="text" [value]="newPlayerConfig.hintLabel || data.player.hintLabel"
(input)="newPlayerConfig.hintLabel = $any($event.target).value"> (input)="newPlayerConfig.hintLabel = $any($event.target).value">
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="newPlayerConfig.hintLabel !== ''" appearance="fill"> <mat-form-field *ngIf="newPlayerConfig.hintLabel !== ''" appearance="fill">
...@@ -206,17 +206,17 @@ export class RichTextEditDialog { ...@@ -206,17 +206,17 @@ export class RichTextEditDialog {
</mat-form-field> </mat-form-field>
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>activeAfter</mat-label> <mat-label>activeAfter</mat-label>
<input matInput type="text" [value]="newPlayerConfig.activeAfter" <input matInput type="text" [value]="newPlayerConfig.activeAfter || data.player.activeAfter"
(input)="newPlayerConfig.activeAfter = $any($event.target).value"> (input)="newPlayerConfig.activeAfter = $any($event.target).value">
</mat-form-field> </mat-form-field>
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>minRuns</mat-label> <mat-label>minRuns</mat-label>
<input matInput type="number" [value]="newPlayerConfig.minRuns" <input matInput type="number" [value]="newPlayerConfig.minRuns || data.player.minRuns"
(input)="newPlayerConfig.minRuns = $any($event.target).value"> (input)="newPlayerConfig.minRuns = $any($event.target).value">
</mat-form-field> </mat-form-field>
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>maxRuns</mat-label> <mat-label>maxRuns</mat-label>
<input matInput type="number" [value]="newPlayerConfig.maxRuns" <input matInput type="number" [value]="newPlayerConfig.maxRuns || data.player.maxRuns"
(input)="newPlayerConfig.maxRuns = $any($event.target).value"> (input)="newPlayerConfig.maxRuns = $any($event.target).value">
</mat-form-field> </mat-form-field>
</div> </div>
...@@ -231,9 +231,8 @@ export class RichTextEditDialog { ...@@ -231,9 +231,8 @@ export class RichTextEditDialog {
'.property-column {margin-right: 20px}' '.property-column {margin-right: 20px}'
] ]
}) })
export class PlayerEditDialog { // TODO return only changed values, so not all the properties have to be overwritten export class PlayerEditDialog {
newPlayerConfig: PlayerElement; newPlayerConfig: PlayerElement = {} as PlayerElement;
constructor(@Inject(MAT_DIALOG_DATA)public data: { player: PlayerElement }) { constructor(@Inject(MAT_DIALOG_DATA)public data: { player: PlayerElement }) {
this.newPlayerConfig = data.player;
} }
} }
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