From 7c199801f3e920d725294faef2bd528ed09a9e9e Mon Sep 17 00:00:00 2001
From: = <lukas.haase@mni.thm.de>
Date: Tue, 5 Nov 2019 11:14:13 +0100
Subject: [PATCH] tslint directive fix
---
projects/ars/src/lib/ars.module.ts | 6 +++---
.../slider/ars-slider-comb/ars-slider-comb.component.ts | 4 ++--
.../io/slider/{ArsSlider.ts => ars-slider.directive.ts} | 9 +++------
src/app/app.component.html | 1 +
tslint.json | 3 ++-
5 files changed, 11 insertions(+), 12 deletions(-)
rename projects/ars/src/lib/components/io/slider/{ArsSlider.ts => ars-slider.directive.ts} (84%)
diff --git a/projects/ars/src/lib/ars.module.ts b/projects/ars/src/lib/ars.module.ts
index 638e7649b..3ec8d95bd 100644
--- a/projects/ars/src/lib/ars.module.ts
+++ b/projects/ars/src/lib/ars.module.ts
@@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { ArsComponent } from './ars.component';
-import { ArsSlider } from './components/io/slider/ArsSlider';
+import { ArsSliderDirective } from './components/io/slider/ars-slider.directive';
import { ArsSliderCombComponent } from './components/io/slider/ars-slider-comb/ars-slider-comb.component';
import { MatButtonModule, MatIconModule } from '@angular/material';
@NgModule({
declarations: [
ArsComponent,
- ArsSlider,
+ ArsSliderDirective,
ArsSliderCombComponent
],
imports: [
@@ -16,7 +16,7 @@ import { MatButtonModule, MatIconModule } from '@angular/material';
],
exports: [
ArsComponent,
- ArsSlider,
+ ArsSliderDirective,
ArsSliderCombComponent
]
})
diff --git a/projects/ars/src/lib/components/io/slider/ars-slider-comb/ars-slider-comb.component.ts b/projects/ars/src/lib/components/io/slider/ars-slider-comb/ars-slider-comb.component.ts
index e6e83abb4..de76df8b1 100644
--- a/projects/ars/src/lib/components/io/slider/ars-slider-comb/ars-slider-comb.component.ts
+++ b/projects/ars/src/lib/components/io/slider/ars-slider-comb/ars-slider-comb.component.ts
@@ -1,5 +1,5 @@
import { AfterViewInit, Component, ContentChild, ElementRef, Input, OnInit, Renderer2 } from '@angular/core';
-import { ArsSlider } from '../ArsSlider';
+import { ArsSliderDirective } from '../ars-slider.directive';
@Component({
selector: 'ars-slider-comb',
@@ -11,7 +11,7 @@ export class ArsSliderCombComponent implements OnInit, AfterViewInit {
@Input() width: number;
@Input() leftIcon = 'keyboard_arrow_left';
@Input() rightIcon = 'keyboard_arrow_right';
- @ContentChild(ArsSlider) slider: ArsSlider;
+ @ContentChild(ArsSliderDirective) slider: ArsSliderDirective;
constructor(private ref: ElementRef, private render: Renderer2) {
}
diff --git a/projects/ars/src/lib/components/io/slider/ArsSlider.ts b/projects/ars/src/lib/components/io/slider/ars-slider.directive.ts
similarity index 84%
rename from projects/ars/src/lib/components/io/slider/ArsSlider.ts
rename to projects/ars/src/lib/components/io/slider/ars-slider.directive.ts
index a19da49f7..1e7b1524a 100644
--- a/projects/ars/src/lib/components/io/slider/ArsSlider.ts
+++ b/projects/ars/src/lib/components/io/slider/ars-slider.directive.ts
@@ -3,11 +3,9 @@ import { MatSlider } from '@angular/material';
@Directive({
- // tslint:disable-next-line:directive-selector
selector: '[ars-slider]'
})
-// tslint:disable-next-line:directive-class-suffix
-export class ArsSlider implements OnInit, AfterViewInit {
+export class ArsSliderDirective implements OnInit, AfterViewInit {
public static classes: Object = {
'mat-slider-wrapper': '',
@@ -36,9 +34,8 @@ export class ArsSlider implements OnInit, AfterViewInit {
ngAfterViewInit() {
Array.from(this.elem.getElementsByTagName('*')).forEach(e => {
- console.log(e.className);
- if (ArsSlider.classes.hasOwnProperty(e.className)) {
- (<HTMLElement>e).style.background = ArsSlider.classes[e.className];
+ if (ArsSliderDirective.classes.hasOwnProperty(e.className)) {
+ (<HTMLElement>e).style.background = ArsSliderDirective.classes[e.className];
}
});
this.render.setStyle(this.elem, 'height', '48px');
diff --git a/src/app/app.component.html b/src/app/app.component.html
index c2246001e..012038d30 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -30,3 +30,4 @@
</button>
</div>
</div>
+
diff --git a/tslint.json b/tslint.json
index d38c3b7a3..a994cf4e4 100644
--- a/tslint.json
+++ b/tslint.json
@@ -128,7 +128,8 @@
true,
"attribute",
"app",
- "camelCase"
+ "camelCase",
+ "allow-snake-case "
],
"component-selector": [
true,
--
GitLab