diff --git a/sass/app.scss b/sass/app.scss index 4db4b411..b7410044 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -119,7 +119,7 @@ ul { &__name, &__abbrev { - &[contenteditable=true]{ + &[contenteditable=true] { border: none; border-bottom: 2px dotted #999; padding: 0 0.5rem; diff --git a/sass/style.scss b/sass/style.scss index baf0d6fc..4c9eb4bb 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -193,9 +193,9 @@ } .select2-results { - text-align: center; + text-align: center; } .select2-container--default .select2-selection--single .select2-selection__rendered { - line-height: 26px !important; + line-height: 26px; } diff --git a/src/app.module.ts b/src/app.module.ts index 0c5a7f07..5bc0335d 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -16,7 +16,6 @@ import { SvgKeystrokeKeyComponent } from './components/svg/keys/svg-keystroke-ke import { SvgOneLineTextKeyComponent } from './components/svg/keys/svg-one-line-text-key.component'; import { SvgTwoLineTextKeyComponent } from './components/svg/keys/svg-two-line-text-key.component'; - @NgModule({ declarations: [ MainAppComponent, diff --git a/src/components/keymap/keymap.component.ts b/src/components/keymap/keymap.component.ts index 600ce041..d278dd49 100644 --- a/src/components/keymap/keymap.component.ts +++ b/src/components/keymap/keymap.component.ts @@ -45,8 +45,8 @@ export class KeymapComponent implements OnInit, AfterViewInit { } ngOnInit() { - this.subParams = this.route.params.subscribe(params => { - let id: number = +params['id']; + this.subParams = this.route.params.subscribe((params: { id: string }) => { + let id: number = +params.id; if (!isNaN(id)) { this.keymapId = id; @@ -125,7 +125,7 @@ export class KeymapComponent implements OnInit, AfterViewInit { let animationNameTokens: string[] = event.animationName.split('-'); let animationFrom: string = animationNameTokens[1]; let animationTo: string = animationNameTokens[2]; - if (( event.target).style.animationDirection === 'reverse') { + if ((event.target).style.animationDirection === 'reverse') { animationFrom = animationNameTokens[2]; animationTo = animationNameTokens[1]; this.renderer.setElementStyle(event.target, 'animation-direction', undefined); diff --git a/src/components/legacy/legacy-loader.component.ts b/src/components/legacy/legacy-loader.component.ts index 5cb0a602..ab509a9c 100644 --- a/src/components/legacy/legacy-loader.component.ts +++ b/src/components/legacy/legacy-loader.component.ts @@ -5,7 +5,7 @@ import {ActivatedRoute} from '@angular/router'; @Component({ selector: 'legacy', template: - ` + ` `, styles: [require('./legacy-loader.component.scss')] @@ -13,13 +13,12 @@ import {ActivatedRoute} from '@angular/router'; export class LegacyLoaderComponent { private safeLink: SafeResourceUrl; - constructor(private sanitationService: DomSanitizationService, private route: ActivatedRoute) { - } + constructor(private sanitationService: DomSanitizationService, private route: ActivatedRoute) { } ngOnInit() { - this.route.params.subscribe(params => { - if (params['id']) { - this.safeLink = this.sanitationService.bypassSecurityTrustResourceUrl(params['id'] + 'Legacy.html'); + this.route.params.subscribe((params: { id: string }) => { + if (params.id) { + this.safeLink = this.sanitationService.bypassSecurityTrustResourceUrl(params.id + 'Legacy.html'); } }); } diff --git a/src/components/popover/popover.component.ts b/src/components/popover/popover.component.ts index 95e78588..f0efdd0f 100644 --- a/src/components/popover/popover.component.ts +++ b/src/components/popover/popover.component.ts @@ -52,7 +52,10 @@ export class PopoverComponent implements OnInit { @ViewChild('tab') selectedTab: Tab; + /* tslint:disable:variable-name: It is an enum type. So it can start with uppercase. */ + /* tslint:disable:no-unused-variable: It is used in the template. */ private TabName = TabName; + /* tslint:enable:no-unused-variable tslint:enable:variable-name */ private activeTab: TabName; constructor() { } diff --git a/src/components/popover/tab/keypress/keypress-tab.component.ts b/src/components/popover/tab/keypress/keypress-tab.component.ts index dd5e566d..1298220c 100644 --- a/src/components/popover/tab/keypress/keypress-tab.component.ts +++ b/src/components/popover/tab/keypress/keypress-tab.component.ts @@ -65,7 +65,6 @@ export class KeypressTabComponent implements OnInit, Tab { // Restore scancode this.scanCode = keystrokeAction.scancode || 0; - let leftModifiersLength: number = this.leftModifiers.length; // Restore modifiers @@ -131,12 +130,16 @@ export class KeypressTabComponent implements OnInit, Tab { } // TODO: change to the correct type when the wrapper has added it. + /* tslint:disable:no-unused-variable: It is used in the template. */ private onLongpressChange(event: any) { + /* tslint:enable:no-unused-variable: */ this.selectedLongPressIndex = +event.value; } // TODO: change to the correct type when the wrapper has added it. + /* tslint:disable:no-unused-variable: It is used in the template. */ private onScancodeChange(event: any) { + /* tslint:enable:no-unused-variable */ this.scanCode = +event.value; } diff --git a/src/components/popover/tab/layer/layer-tab.component.ts b/src/components/popover/tab/layer/layer-tab.component.ts index 7681438d..44838f10 100644 --- a/src/components/popover/tab/layer/layer-tab.component.ts +++ b/src/components/popover/tab/layer/layer-tab.component.ts @@ -23,6 +23,7 @@ export class LayerTabComponent implements OnInit, Tab { private toggle: boolean; private layer: LayerName; + /* tslint:disable:no-unused-variable: They're used in the template */ private toggleData: Array = [ { id: 'false', @@ -48,6 +49,7 @@ export class LayerTabComponent implements OnInit, Tab { text: 'Mouse' } ]; + /* tslint:enable:no-unused-variable */ constructor() { this.toggle = false; @@ -80,12 +82,16 @@ export class LayerTabComponent implements OnInit, Tab { } // TODO: change to the correct type when the wrapper has added it. + /* tslint:disable:no-unused-variable: This function is used in the template */ private toggleChanged(event: any) { + /* tslint:enable:no-unused-variable */ this.toggle = event.value; } // TODO: change to the correct type when the wrapper has added it. + /* tslint:disable:no-unused-variable: This function is used in the template */ private layerChanged(event: any) { + /* tslint:enable:no-unused-variable */ this.layer = +event.value; } } diff --git a/src/components/popover/tab/macro/macro-item.component.ts b/src/components/popover/tab/macro/macro-item.component.ts index 4f4610c6..d2b2dc87 100644 --- a/src/components/popover/tab/macro/macro-item.component.ts +++ b/src/components/popover/tab/macro/macro-item.component.ts @@ -2,16 +2,10 @@ import { Component, OnInit, OnChanges, Input } from '@angular/core'; import {MacroAction} from '../../../../../config-serializer/config-items/MacroAction'; import {DelayMacroAction} from '../../../../../config-serializer/config-items/DelayMacroAction'; -import {HoldKeyMacroAction} from '../../../../../config-serializer/config-items/HoldKeyMacroAction'; import {HoldModifiersMacroAction} from '../../../../../config-serializer/config-items/HoldModifiersMacroAction'; -import {HoldMouseButtonsMacroAction} from '../../../../../config-serializer/config-items/HoldMouseButtonsMacroAction'; import {MoveMouseMacroAction} from '../../../../../config-serializer/config-items/MoveMouseMacroAction'; -import {PressKeyMacroAction} from '../../../../../config-serializer/config-items/PressKeyMacroAction'; import {PressModifiersMacroAction} from '../../../../../config-serializer/config-items/PressModifiersMacroAction'; -import {PressMouseButtonsMacroAction} from '../../../../../config-serializer/config-items/PressMouseButtonsMacroAction'; -import {ReleaseKeyMacroAction} from '../../../../../config-serializer/config-items/ReleaseKeyMacroAction'; import {ReleaseModifiersMacroAction} from '../../../../../config-serializer/config-items/ReleaseModifiersMacroAction'; -import {ReleaseMouseButtonsMacroAction} from '../../../../../config-serializer/config-items/ReleaseMouseButtonsMacroAction'; import {ScrollMouseMacroAction} from '../../../../../config-serializer/config-items/ScrollMouseMacroAction'; import {TextMacroAction} from '../../../../../config-serializer/config-items/TextMacroAction'; diff --git a/src/components/popover/tab/mouse/mouse-tab.component.ts b/src/components/popover/tab/mouse/mouse-tab.component.ts index e5ece49c..7a4e50f5 100644 --- a/src/components/popover/tab/mouse/mouse-tab.component.ts +++ b/src/components/popover/tab/mouse/mouse-tab.component.ts @@ -17,7 +17,10 @@ export class MouseTabComponent implements OnInit, Tab { private mouseActionParam: MouseActionParam; private selectedPageIndex: number; + /* tslint:disable:variable-name: It is an enum type. So it can start with uppercase. */ + /* tslint:disable:no-unused-variable: It is used in the template. */ private MouseActionParam = MouseActionParam; + /* tslint:enable:no-unused-variable tslint:enable:variable-name */ private pages: string[]; diff --git a/src/components/popover/tab/none/none-tab.component.ts b/src/components/popover/tab/none/none-tab.component.ts index cba0e7cf..3f6a8680 100644 --- a/src/components/popover/tab/none/none-tab.component.ts +++ b/src/components/popover/tab/none/none-tab.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit } from '@angular/core'; import {Tab} from '../tab'; -import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction'; import {NoneAction} from '../../../../../config-serializer/config-items/NoneAction'; @Component({ @@ -19,7 +18,7 @@ export class NoneTabComponent implements OnInit, Tab { return true; } - fromKeyAction(keyAction: KeyAction): boolean { + fromKeyAction(): boolean { return false; } diff --git a/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts b/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts index ee45114c..b2320c22 100644 --- a/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts +++ b/src/components/popover/widgets/capture-keystroke/capture-keystroke-button.component.ts @@ -13,11 +13,11 @@ export class CaptureKeystrokeButtonComponent implements OnInit { ngOnInit() { } - private start(): void { + start(): void { this.record = true; } - private stop(): void { + stop(): void { this.record = false; } diff --git a/src/components/sidemenu/side-menu.component.ts b/src/components/sidemenu/side-menu.component.ts index aaf0ecb8..7338c126 100644 --- a/src/components/sidemenu/side-menu.component.ts +++ b/src/components/sidemenu/side-menu.component.ts @@ -16,15 +16,16 @@ export class SideMenuComponent implements OnInit { private keymaps: Keymap[]; private macros: Macro[]; - constructor(private uhkConfigurationService: UhkConfigurationService) { - } + constructor(private uhkConfigurationService: UhkConfigurationService) { } ngOnInit() { this.keymaps = this.uhkConfigurationService.getUhkConfiguration().keymaps.elements; this.macros = this.uhkConfigurationService.getUhkConfiguration().macros.elements; } + /* tslint:disable:no-unused-variable: This function is used in the template */ private toggleHide(event: Event, view: Element) { + /* tslint:enable:no-unused-variable */ let header: DOMTokenList = ( event.target).classList; view.classList.toggle('slide-up'); diff --git a/src/components/svg/keys/svg-text-icon-key.component.ts b/src/components/svg/keys/svg-text-icon-key.component.ts index 3607c46d..e0bff515 100644 --- a/src/components/svg/keys/svg-text-icon-key.component.ts +++ b/src/components/svg/keys/svg-text-icon-key.component.ts @@ -11,7 +11,6 @@ export class SvgTextIconKeyComponent implements OnInit { @Input() text: string; @Input() icon: string; - private useWidth: number; private useHeight: number; private useX: number; diff --git a/src/components/svg/keys/svg-two-line-text-key.component.html b/src/components/svg/keys/svg-two-line-text-key.component.html index 24666060..54d92406 100644 --- a/src/components/svg/keys/svg-two-line-text-key.component.html +++ b/src/components/svg/keys/svg-two-line-text-key.component.html @@ -5,7 +5,7 @@ {{ text }} \ No newline at end of file diff --git a/src/components/svg/keys/svg-two-line-text-key.component.ts b/src/components/svg/keys/svg-two-line-text-key.component.ts index 31eeca52..9973e171 100644 --- a/src/components/svg/keys/svg-two-line-text-key.component.ts +++ b/src/components/svg/keys/svg-two-line-text-key.component.ts @@ -12,15 +12,17 @@ export class SvgTwoLineTextKeyComponent implements OnInit { private textY: number; private spanX: number; + private spanYs: number[]; - constructor() { } + constructor() { + this.spanYs = []; + } ngOnInit() { this.textY = this.height / 2; this.spanX = this.width / 2; - } - - private spanY(index: number) { - return (0.75 - index * 0.5) * this.height; + for (let i = 0; i < this.texts.length; ++i) { + this.spanYs.push((0.75 - i * 0.5) * this.height); + } } } diff --git a/tslint.json b/tslint.json index 908aaa4d..7cb9af83 100644 --- a/tslint.json +++ b/tslint.json @@ -94,8 +94,7 @@ "check-operator", "check-module", "check-separator", - "check-type", - "check-typecast" + "check-type" ] } } \ No newline at end of file