uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: Layer

Browse Source
This commit is contained in:
Farkas József
2016-09-25 14:14:02 +02:00
parent 7ba0a0401a
commit a719f06618
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/popover/tab/keymap/keymap-tab.component.html
View File

@@ -12,6 +12,6 @@
<img src="./images/base-layer--blank.svg">
</div>
<svg-keyboard *ngIf="selectedKeymap?.abbreviation"
[moduleConfig]="selectedKeymap.layers[0].modules.elements">
[moduleConfig]="selectedKeymap.layers[0].modules">
</svg-keyboard>
</div>

2
src/components/svg/wrap/svg-keyboard-wrap.component.html
View File

@@ -3,7 +3,7 @@
<div class="keyboard-slider" (mouseout)="hideTooltip($event)">
<svg-keyboard *ngFor="let layer of layers"
[@layerState]="layer.animation"
[moduleConfig]="layer.modules.elements"
[moduleConfig]="layer.modules"
(keyClick)="onKeyClick($event.moduleId, $event.keyId)"
(keyHover)="onKeyHover($event.moduleId, $event.event, $event.over, $event.keyId)"
>

4
src/components/svg/wrap/svg-keyboard-wrap.component.ts
View File

@@ -130,7 +130,7 @@ export class SvgKeyboardWrapComponent implements OnChanges {
onKeyClick(moduleId: number, keyId: number): void {
if (!this.popoverShown && this.popoverEnabled) {
this.keyEditConfig = {
keyActions: this.layers[this.currentLayer].modules.elements[moduleId].keyActions.elements,
keyActions: this.layers[this.currentLayer].modules[moduleId].keyActions.elements,
keyId
};
@@ -140,7 +140,7 @@ export class SvgKeyboardWrapComponent implements OnChanges {
}
onKeyHover(moduleId: number, event: MouseEvent, over: boolean, keyId: number): void {
let keyActionToEdit: KeyAction = this.layers[this.currentLayer].modules.elements[moduleId].keyActions.elements[keyId];
let keyActionToEdit: KeyAction = this.layers[this.currentLayer].modules[moduleId].keyActions.elements[keyId];
if (this.tooltipEnabled) {
if (over) {