From 8d4ecb75c72aabe037f7fe8f5ca4e3c292d13330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Farkas=20J=C3=B3zsef?= Date: Fri, 16 Dec 2016 22:13:05 +0100 Subject: [PATCH] Update tslint to 4.x.x Closes #166 --- package.json | 2 +- src/components/popover/popover.component.ts | 2 +- .../config-items/key-action/KeystrokeAction.ts | 2 +- tslint.json | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index c01be516..d7b78b9f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "sass-loader": "^4.1.0", "stylelint": "^7.0.3", "ts-loader": "^1.3.2", - "tslint": "3.15.1", + "tslint": "~4.1.1", "webpack": "^1.14.0", "webpack-dev-server": "^1.16.2", "webpack-fail-plugin": "^1.0.5", diff --git a/src/components/popover/popover.component.ts b/src/components/popover/popover.component.ts index 31a1dd8b..cb7e89db 100644 --- a/src/components/popover/popover.component.ts +++ b/src/components/popover/popover.component.ts @@ -4,6 +4,7 @@ import { } from '@angular/core'; import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs/Observable'; import { KeyAction, @@ -19,7 +20,6 @@ import { Tab } from './tab/tab'; import { AppState } from '../../store'; import { getKeymapEntities } from '../../store/reducers'; -import { Observable } from 'rxjs/Observable'; enum TabName { Keypress, diff --git a/src/config-serializer/config-items/key-action/KeystrokeAction.ts b/src/config-serializer/config-items/key-action/KeystrokeAction.ts index 9cd9d402..36c0c773 100644 --- a/src/config-serializer/config-items/key-action/KeystrokeAction.ts +++ b/src/config-serializer/config-items/key-action/KeystrokeAction.ts @@ -7,7 +7,7 @@ import { KeyAction, KeyActionId, keyActionType } from './KeyAction'; export enum KeystrokeActionFlag { scancode = 1 << 0, modifierMask = 1 << 1, - longPressAction = 1 << 2, + longPressAction = 1 << 2 } interface JsonObjectKeystrokeAction { diff --git a/tslint.json b/tslint.json index 9608f733..e2d11e27 100644 --- a/tslint.json +++ b/tslint.json @@ -11,18 +11,12 @@ "class-name": true, "curly": true, "no-construct": true, - "no-duplicate-key": true, "no-duplicate-variable": true, "no-eval": true, "no-null-keyword": true, "no-shadowed-variable": true, "no-switch-case-fall-through": true, - "no-unreachable": true, "no-unused-expression": true, - "no-unused-variable": [ - true, - "check-parameters" - ], "no-use-before-declare": true, "no-var-keyword": true, "radix": true,