From 13d91ad26b4aea0da87a2d252429f9452db0b119 Mon Sep 17 00:00:00 2001
From: NejcZdovc <nejc.zdovc@3zsistemi.si>
Date: Fri, 30 Dec 2016 11:40:22 +0100
Subject: [PATCH] Removed fast capturing for add keymap page

Fixes #238
---
 src/components/keyboard/slider/keyboard-slider.component.html  | 1 +
 src/components/keyboard/slider/keyboard-slider.component.ts    | 1 +
 src/components/svg/keyboard/svg-keyboard.component.html        | 1 +
 src/components/svg/keyboard/svg-keyboard.component.ts          | 1 +
 .../svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts    | 3 ++-
 src/components/svg/module/svg-module.component.html            | 1 +
 src/components/svg/module/svg-module.component.ts              | 1 +
 src/components/svg/wrap/svg-keyboard-wrap.component.html       | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/keyboard/slider/keyboard-slider.component.html b/src/components/keyboard/slider/keyboard-slider.component.html
index 2882ff0d..3b328de7 100644
--- a/src/components/keyboard/slider/keyboard-slider.component.html
+++ b/src/components/keyboard/slider/keyboard-slider.component.html
@@ -2,6 +2,7 @@
     [@layerState]="layerAnimationState[index]"
     [moduleConfig]="layer.modules"
     [keybindAnimationEnabled]="keybindAnimationEnabled"
+    [capturingEnabled]="capturingEnabled"
     (keyClick)="keyClick.emit($event)"
     (keyHover)="keyHover.emit($event)"
     (capture)="capture.emit($event)"
diff --git a/src/components/keyboard/slider/keyboard-slider.component.ts b/src/components/keyboard/slider/keyboard-slider.component.ts
index 0b1e5ec8..58e76537 100644
--- a/src/components/keyboard/slider/keyboard-slider.component.ts
+++ b/src/components/keyboard/slider/keyboard-slider.component.ts
@@ -79,6 +79,7 @@ export class KeyboardSliderComponent implements OnChanges {
     @Input() layers: Layer[];
     @Input() currentLayer: number;
     @Input() keybindAnimationEnabled: boolean;
+    @Input() capturingEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() keyHover = new EventEmitter();
     @Output() capture = new EventEmitter();
diff --git a/src/components/svg/keyboard/svg-keyboard.component.html b/src/components/svg/keyboard/svg-keyboard.component.html
index e707b459..cc35f496 100644
--- a/src/components/svg/keyboard/svg-keyboard.component.html
+++ b/src/components/svg/keyboard/svg-keyboard.component.html
@@ -4,6 +4,7 @@
                 [coverages]="module.coverages"
                 [keyboardKeys]="module.keyboardKeys"
                 [keybindAnimationEnabled]="keybindAnimationEnabled"
+                [capturingEnabled]="capturingEnabled"
                 [attr.transform]="module.attributes.transform"
                 [keyActions]="moduleConfig[i].keyActions"
                 (keyClick)="onKeyClick(i, $event.index, $event.keyTarget)"
diff --git a/src/components/svg/keyboard/svg-keyboard.component.ts b/src/components/svg/keyboard/svg-keyboard.component.ts
index a2af4309..86164038 100644
--- a/src/components/svg/keyboard/svg-keyboard.component.ts
+++ b/src/components/svg/keyboard/svg-keyboard.component.ts
@@ -11,6 +11,7 @@ import { SvgModule } from '../module';
 export class SvgKeyboardComponent implements OnInit {
     @Input() moduleConfig: Module[];
     @Input() keybindAnimationEnabled: boolean;
+    @Input() capturingEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() keyHover = new EventEmitter();
     @Output() capture = new EventEmitter();
diff --git a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index 156e6be3..90e967f7 100644
--- a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -70,6 +70,7 @@ export class SvgKeyboardKeyComponent implements OnInit, OnChanges, OnDestroy {
     @Input() width: number;
     @Input() keyAction: KeyAction;
     @Input() keybindAnimationEnabled: boolean;
+    @Input() capturingEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() capture = new EventEmitter();
 
@@ -92,7 +93,7 @@ export class SvgKeyboardKeyComponent implements OnInit, OnChanges, OnDestroy {
 
     @HostListener('mousedown', ['$event'])
     onMouseDown(e: MouseEvent) {
-        if (e.which === 2 || e.button === 1) {
+        if ((e.which === 2 || e.button === 1) && this.capturingEnabled) {
             e.preventDefault();
             this.renderer.invokeElementMethod(this.element.nativeElement, 'focus');
 
diff --git a/src/components/svg/module/svg-module.component.html b/src/components/svg/module/svg-module.component.html
index 5a507a5d..4b0b74e0 100644
--- a/src/components/svg/module/svg-module.component.html
+++ b/src/components/svg/module/svg-module.component.html
@@ -6,6 +6,7 @@
         [attr.transform]="'translate(' + key.x + ' ' + key.y + ')'"
         [keyAction]="keyActions[i]"
         [keybindAnimationEnabled]="keybindAnimationEnabled"
+        [capturingEnabled]="capturingEnabled"
         (keyClick)="onKeyClick(i, $event)"
         (capture)="onCapture(i, $event)"
         (mouseenter)="onKeyHover(i, $event, true)"
diff --git a/src/components/svg/module/svg-module.component.ts b/src/components/svg/module/svg-module.component.ts
index 82b491e2..ab17db8d 100644
--- a/src/components/svg/module/svg-module.component.ts
+++ b/src/components/svg/module/svg-module.component.ts
@@ -14,6 +14,7 @@ export class SvgModuleComponent {
     @Input() keyboardKeys: SvgKeyboardKey[];
     @Input() keyActions: KeyAction[];
     @Input() keybindAnimationEnabled: boolean;
+    @Input() capturingEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() keyHover = new EventEmitter();
     @Output() capture = new EventEmitter();
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.html b/src/components/svg/wrap/svg-keyboard-wrap.component.html
index 7b30fddd..0bcaa733 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.html
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.html
@@ -3,6 +3,7 @@
     <keyboard-slider [layers]="layers"
                      [currentLayer]="currentLayer"
                      [keybindAnimationEnabled]="keybindAnimationEnabled"
+                     [capturingEnabled]="popoverEnabled"
                      (keyClick)="onKeyClick($event.moduleId, $event.keyId, $event.keyTarget)"
                      (keyHover)="onKeyHover($event.moduleId, $event.event, $event.over, $event.keyId)"
                      (capture)="onCapture($event.moduleId, $event.keyId, $event.captured)"