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

Hide popover when you delete or switch keymap; Disable layer switch when popover is opened

Browse Source
This commit is contained in:
NejcZdovc
2016-11-17 07:12:38 +01:00
committed by József Farkas
parent 68d6dbe723
commit ff47222d21
6 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<template ngIf="layers">
<layers (select)="selectLayer($event.oldIndex, $event.index)" [current]="currentLayer"></layers>
<layers [class.disabled]="popoverShown" (select)="selectLayer($event.oldIndex, $event.index)" [current]="currentLayer"></layers>
<div class="keyboard-slider" (mouseout)="hideTooltip($event)">
<svg-keyboard *ngFor="let layer of layers"
[@layerState]="layer.animation"

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

@@ -91,6 +91,7 @@ export class SvgKeyboardWrapComponent implements OnChanges {
@Input() keymap: Keymap;
@Input() popoverEnabled: boolean = true;
@Input() tooltipEnabled: boolean = false;
@Input() deleted: boolean = false;
private popoverShown: boolean;
private keyEditConfig: { keyActions: KeyAction[], keyId: number };
@@ -119,11 +120,14 @@ export class SvgKeyboardWrapComponent implements OnChanges {
if (changes['keymap'].previousValue.abbreviation !== changes['keymap'].currentValue.abbreviation) {
this.layers = this.keymap.layers;
this.currentLayer = 0;
this.popoverShown = false;
if (this.layers.length > 0) {
this.layers.forEach(element => element.animation = 'none');
this.layers[0].animation = 'leftIn';
}
} else if (changes['keymap']) {
this.popoverShown = false;
}
}