Skip to content

Commit a466ab2

Browse files
mledourmledour
committed
chore: update lint rules
1 parent 3573802 commit a466ab2

31 files changed

+281
-288
lines changed

‎library/angular-admin-lte/src/lib/accordion/accordion.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h4 class="box-title">
88
</a>
99
</h4>
1010
</div>
11-
<div class="panel-collapse" [mkCollapseAnimation]="accordion.isCollapsed" (mkCollapseAnimation.start)="collapseStart($event, accordion)" (mkCollapseAnimation.done)="collapseDone($event, accordion)">
11+
<div class="panel-collapse" [mkCollapseAnimation]="accordion.isCollapsed" (mkCollapseAnimation.start)="onCollapseStart($event, accordion)" (mkCollapseAnimation.done)="onCollapseDone($event, accordion)">
1212
<div [ngClass]="accordion.contentStyleClass" [mkFontColor]="accordion.contentColor">
1313
<ng-template [ngTemplateOutlet]="accordion.contentTemplateRef"></ng-template>
1414
</div>

‎library/angular-admin-lte/src/lib/accordion/accordion.component.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export class AccordionComponent implements OnInit {
107107
export class AccordionGroupComponent implements AfterContentInit, AfterViewInit, OnChanges, OnDestroy {
108108
private activeIndex: any = [0];
109109
// @TODO change types for listeners to all files
110-
private listeners: Array<Function> = [];
110+
private listeners: Array<() => void> = [];
111111
// @TODO change types for subscriptions to all files
112112
private subscriptions: Array<Subscription> = [];
113113

@@ -118,8 +118,8 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
118118
@Input() public isMultiple: boolean;
119119
@Input() public styleClass = 'box-group';
120120

121-
@Output() public onCollapseStart = new EventEmitter();
122-
@Output() public onCollapseDone = new EventEmitter();
121+
@Output() public collapseStart = new EventEmitter();
122+
@Output() public collapseDone = new EventEmitter();
123123

124124
@ContentChildren(AccordionComponent) public accordionComponents: QueryList<AccordionComponent>;
125125

@@ -209,7 +209,7 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
209209
public toggleAccordion(event: Event, toggleIndex: number): void {
210210
event.preventDefault();
211211

212-
const indexOf = this.activeIndex['indexOf'](toggleIndex);
212+
const indexOf = this.activeIndex.indexOf(toggleIndex);
213213
if (indexOf === -1) {
214214
if (this.isMultiple) {
215215
this.activeIndex.push(toggleIndex);
@@ -232,9 +232,9 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
232232
* @param event [description]
233233
* @param accordion [description]
234234
*/
235-
public collapseStart(event: AnimationEvent, accordion: AccordionComponent): void {
235+
public onCollapseStart(event: AnimationEvent, accordion: AccordionComponent): void {
236236
accordion.isCollapsing = true;
237-
this.onCollapseStart.emit({animationEvent: event, index: accordion.index});
237+
this.collapseStart.emit({animationEvent: event, index: accordion.index});
238238
}
239239

240240
/**
@@ -243,9 +243,9 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
243243
* @param event [description]
244244
* @param accordion [description]
245245
*/
246-
public collapseDone(event: AnimationEvent, accordion: AccordionComponent): void {
246+
public onCollapseDone(event: AnimationEvent, accordion: AccordionComponent): void {
247247
accordion.isCollapsing = false;
248-
this.onCollapseDone.emit({animationEvent: event, index: accordion.index});
248+
this.collapseDone.emit({animationEvent: event, index: accordion.index});
249249
}
250250

251251
/**

‎library/angular-admin-lte/src/lib/alert/alert.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div *ngIf="!removed" [mkCollapseAnimation]="remove" (mkCollapseAnimation.start)="collapseStart($event)" (mkCollapseAnimation.done)="collapseDone($event)">
1+
<div *ngIf="!removed" [mkCollapseAnimation]="remove" (mkCollapseAnimation.start)="onCollapseStart($event)" (mkCollapseAnimation.done)="onCollapseDone($event)">
22
<div [mkColor]="backgroundColor" mkColorProperty="background-color" [mkColorPrefix]="type" [mkFontColor]="color" [ngClass]="[styleClass, dismissibleClass, type]">
33
<button *ngIf="isDismissible" type="button" class="close" #removeButtonElement>&times;</button>
44
<ng-content></ng-content>

‎library/angular-admin-lte/src/lib/alert/alert.component.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export class AlertComponent implements AfterViewInit, OnDestroy {
5353
}
5454
@Input() public styleClass = '';
5555

56-
@Output() public onCollapseStart = new EventEmitter();
57-
@Output() public onCollapseDone = new EventEmitter();
56+
@Output() public collapseStart = new EventEmitter();
57+
@Output() public collapseDone = new EventEmitter();
5858

5959
@ViewChild('removeButtonElement') private removeButtonElement: ElementRef;
6060
@ViewChild('containerElementRef', { read: ViewContainerRef }) private containerElementRef: ViewContainerRef;
@@ -107,22 +107,22 @@ export class AlertComponent implements AfterViewInit, OnDestroy {
107107
* @method collapseStart
108108
* @param event [description]
109109
*/
110-
public collapseStart(event: AnimationEvent): void {
111-
this.onCollapseStart.emit(event);
110+
public onCollapseStart(event: AnimationEvent): void {
111+
this.collapseStart.emit(event);
112112
}
113113

114114
/**
115115
* [collapseDone description]
116116
* @method collapseDone
117117
* @param event [description]
118118
*/
119-
public collapseDone(event: AnimationEvent): void {
119+
public onCollapseDone(event: AnimationEvent): void {
120120
if (event.toState === '1') {
121121
this.listeners = removeListeners(this.listeners);
122122
this.removed = true;
123123
this.viewContainerRef.clear();
124124
this.changeDetectorRef.detectChanges();
125125
}
126-
this.onCollapseDone.emit(event);
126+
this.collapseDone.emit(event);
127127
}
128128
}

‎library/angular-admin-lte/src/lib/animations/animations.directive.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class CollapseAnimationDirective implements OnInit, AfterContentInit, OnD
1111
private isCollapsed: boolean;
1212
private lastIsCollapsed: boolean;
1313
private transitioning: boolean;
14-
private listener: Function;
14+
private listener: () => void;
1515

1616
@Input() public collapseAnimationDuration = 350;
1717
@Input() public collapseAnimationTiming: string;
@@ -28,7 +28,9 @@ export class CollapseAnimationDirective implements OnInit, AfterContentInit, OnD
2828
}
2929
}
3030

31+
// tslint:disable-next-line:no-output-rename
3132
@Output('mkCollapseAnimation.start') public startEventEmitter = new EventEmitter();
33+
// tslint:disable-next-line:no-output-rename
3234
@Output('mkCollapseAnimation.done') public doneEventEmitter = new EventEmitter();
3335

3436

@@ -137,7 +139,7 @@ export class CollapseAnimationDirective implements OnInit, AfterContentInit, OnD
137139
const event: AnimationEvent = {
138140
element: this.elementRef.nativeElement,
139141
fromState: this.lastIsCollapsed === undefined ? 'void' : this.lastIsCollapsed ? '1' : '0',
140-
phaseName: phaseName,
142+
phaseName,
141143
toState: this.isCollapsed === undefined ? 'void' : this.isCollapsed ? '1' : '0',
142144
totalTime: this.collapseAnimationDuration,
143145
triggerName: 'mkCollapseAnimation'

‎library/angular-admin-lte/src/lib/box/box.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h3 class="box-title" [mkFontColor]="headerColor">
1414
</button>
1515
</div>
1616
</div>
17-
<div [ngClass]="contentStyleClass" [mkFontColor]="contentColor" [mkCollapseAnimation]="isCollapsed" (mkCollapseAnimation.start)="collapseStart($event)" (mkCollapseAnimation.done)="collapseDone($event)">
17+
<div [ngClass]="contentStyleClass" [mkFontColor]="contentColor" [mkCollapseAnimation]="isCollapsed" (mkCollapseAnimation.start)="onCollapseStart($event)" (mkCollapseAnimation.done)="onCollapseDone($event)">
1818
<div class="box-body">
1919
<ng-container *ngIf="boxHeaderDirective || boxContentDirective || boxFooterDirective || boxToolsDirective; else noDirective">
2020
<ng-content select="mk-box-content"></ng-content>

‎library/angular-admin-lte/src/lib/box/box.component.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ export class BoxComponent implements AfterViewInit, OnDestroy {
5454
@Input() public loadingStyleClass = 'fa fa-refresh fa-spin';
5555
@Input() public styleClass = 'box';
5656

57-
@Output() public onCollapseDone = new EventEmitter();
58-
@Output() public onCollapseStart = new EventEmitter();
57+
@Output() public collapseDone = new EventEmitter();
58+
@Output() public collapseStart = new EventEmitter();
5959

6060
@ContentChild(BoxHeaderDirective, /* TODO: add static flag */ {}) public boxHeaderDirective: BoxHeaderDirective;
6161
@ContentChild(BoxFooterDirective, /* TODO: add static flag */ {}) public boxFooterDirective: BoxFooterDirective;
@@ -120,10 +120,10 @@ export class BoxComponent implements AfterViewInit, OnDestroy {
120120
* @method collapseStart
121121
* @param event [description]
122122
*/
123-
public collapseStart(event: AnimationEvent): void {
123+
public onCollapseStart(event: AnimationEvent): void {
124124
if (event.fromState !== 'void') {
125125
this.isCollaping = true;
126-
this.onCollapseStart.emit(event);
126+
this.collapseStart.emit(event);
127127
}
128128
}
129129

@@ -132,10 +132,10 @@ export class BoxComponent implements AfterViewInit, OnDestroy {
132132
* @method collapseDone
133133
* @param event [description]
134134
*/
135-
public collapseDone(event: AnimationEvent): void {
135+
public onCollapseDone(event: AnimationEvent): void {
136136
if (event.fromState !== 'void') {
137137
this.isCollaping = false;
138-
this.onCollapseDone.emit(event);
138+
this.collapseDone.emit(event);
139139
}
140140
}
141141
}

‎library/angular-admin-lte/src/lib/color/color.definition.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,37 @@ export const colorsAliases = [
88
];
99

1010
export const colors = {
11-
'aqua': '#00c0ef',
11+
aqua: '#00c0ef',
1212
'aqua-active': '#00a7d0',
13-
'black': '#111111',
13+
black: '#111111',
1414
'black-active': '#000000',
15-
'blue': '#0073b7',
15+
blue: '#0073b7',
1616
'blue-active': '#005384',
17-
'fuchsia': '#f012be',
17+
fuchsia: '#f012be',
1818
'fuchsia-active': '#db0ead',
19-
'green': '#00a65a',
19+
green: '#00a65a',
2020
'green-active': '#008d4c',
21-
'gray': '#d2d6de',
21+
gray: '#d2d6de',
2222
'gray-active': '#b5bbc8',
2323
'gray-light': '#f7f7f7',
2424
'light-blue': '#3c8dbc',
2525
'light-blue-active': '#357ca5',
26-
'lime': '#01ff70',
26+
lime: '#01ff70',
2727
'lime-active': '#00e765',
28-
'maroon': '#d81b60',
28+
maroon: '#d81b60',
2929
'maroon-active': '#ca195a',
30-
'navy': '#001f3f',
30+
navy: '#001f3f',
3131
'navy-active': '#001a35',
32-
'olive': '#3d9970',
32+
olive: '#3d9970',
3333
'olive-active': '#368763',
34-
'orange': '#ff851b',
34+
orange: '#ff851b',
3535
'orange-active': '#ff7701',
36-
'purple': '#605ca8',
36+
purple: '#605ca8',
3737
'purple-active': '#555299',
38-
'red': '#dd4b39',
38+
red: '#dd4b39',
3939
'red-active': '#d33724',
40-
'teal': '#39cccc',
40+
teal: '#39cccc',
4141
'teal-active': '#30bbbb',
42-
'yellow': '#f39c12',
42+
yellow: '#f39c12',
4343
'yellow-active': '#db8b0b',
4444
};

‎library/angular-admin-lte/src/lib/color/color.directive.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { ColorService } from './color.service';
88
})
99
export class BackgroundColorDirective {
1010

11-
private _prefix: string;
12-
private _color: string;
11+
private prefix: string;
12+
private color: string;
1313

1414
/**
1515
* @method constructor
@@ -24,14 +24,14 @@ export class BackgroundColorDirective {
2424
) {}
2525

2626
@Input('mkColorCondition') condition = true;
27-
@Input('mkColorPrefix') set prefix(prefix: string) {
28-
this._prefix = prefix;
29-
this.colorService.setBackgroundColor(this._color, this.condition, this.property, this._prefix);
27+
@Input('mkColorPrefix') set setPrefix(prefix: string) {
28+
this.prefix = prefix;
29+
this.colorService.setBackgroundColor(this.color, this.condition, this.property, this.prefix);
3030
}
3131
@Input('mkColorProperty') property: string;
32-
@Input('mkColor') set color(color: string) {
33-
this._color = color;
34-
this.colorService.setBackgroundColor(this._color, this.condition, this.property, this._prefix);
32+
@Input('mkColor') set setColor(color: string) {
33+
this.color = color;
34+
this.colorService.setBackgroundColor(this.color, this.condition, this.property, this.prefix);
3535
}
3636
}
3737

‎library/angular-admin-lte/src/lib/color/color.service.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ export class ColorService {
2020
constructor(
2121
private renderer2: Renderer2,
2222
private elementRef: ElementRef
23-
) {
24-
// this.init();
25-
// console.log(this);
26-
}
23+
) {}
2724

2825
/**
2926
* [setBackgroundColor description]
@@ -38,12 +35,12 @@ export class ColorService {
3835
this.resetBackgroundColor();
3936
if (colors[color]) {
4037
this.renderer2.addClass(this.elementRef.nativeElement, 'bg-color');
41-
this.currentBackgroundStyle = {property: property, color: colors[color]};
38+
this.currentBackgroundStyle = {property, color: colors[color]};
4239
this.renderer2.setStyle(this.elementRef.nativeElement, property, colors[color]);
4340
} else {
4441
this.renderer2.removeClass(this.elementRef.nativeElement, 'bg-color');
4542
if (color.indexOf('#') === 0 || color.indexOf('rgb') === 0) {
46-
this.currentBackgroundStyle = {property: property, color: color};
43+
this.currentBackgroundStyle = {property, color};
4744
this.renderer2.setStyle(this.elementRef.nativeElement, property, color);
4845
} else if (colorsAliases.indexOf(color) !== -1) {
4946
this.currentBackgroundClass = prefix ? `${prefix}-${color}` : color;

0 commit comments

Comments
 (0)