Skip to content

Commit d6d8aa3

Browse files
committed
fixed lint errors
1 parent c50d244 commit d6d8aa3

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

angular/src/account/tenant/tenant-change.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ export class TenantChangeComponent extends AppComponentBase implements OnInit {
1515
super(injector);
1616
}
1717

18+
get isMultiTenancyEnabled(): boolean {
19+
return abp.multiTenancy.isEnabled;
20+
}
21+
1822
ngOnInit() {
1923
if (this.appSession.tenant) {
2024
this.tenancyName = this.appSession.tenant.tenancyName;
2125
this.name = this.appSession.tenant.name;
2226
}
2327
}
2428

25-
get isMultiTenancyEnabled(): boolean {
26-
return abp.multiTenancy.isEnabled;
27-
}
28-
2929
showChangeModal(): void {
3030
const modal = this._modalService.show(TenantChangeDialogComponent);
3131
if (this.appSession.tenant) {

angular/src/shared/components/pagination/abp-pagination-controls.component.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,19 @@ import { Component, Input, Output, EventEmitter } from '@angular/core';
55
templateUrl: './abp-pagination-controls.component.html'
66
})
77
export class AbpPaginationControlsComponent {
8+
89
@Input() id: string;
910
@Input() maxSize = 7;
11+
@Input() previousLabel = 'Previous';
12+
@Input() nextLabel = 'Next';
13+
@Input() screenReaderPaginationLabel = 'Pagination';
14+
@Input() screenReaderPageLabel = 'page';
15+
@Input() screenReaderCurrentLabel = `You're on page`;
16+
@Output() pageChange: EventEmitter<number> = new EventEmitter<number>();
17+
18+
private _directionLinks = true;
19+
private _autoHide = false;
20+
1021
@Input()
1122
get directionLinks(): boolean {
1223
return this._directionLinks;
@@ -21,14 +32,4 @@ export class AbpPaginationControlsComponent {
2132
set autoHide(value: boolean) {
2233
this._autoHide = !!value && <any>value !== 'false';
2334
}
24-
@Input() previousLabel = 'Previous';
25-
@Input() nextLabel = 'Next';
26-
@Input() screenReaderPaginationLabel = 'Pagination';
27-
@Input() screenReaderPageLabel = 'page';
28-
@Input() screenReaderCurrentLabel = `You're on page`;
29-
30-
@Output() pageChange: EventEmitter<number> = new EventEmitter<number>();
31-
32-
private _directionLinks = true;
33-
private _autoHide = false;
3435
}

angular/src/shared/components/validation/abp-validation.summary.component.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,7 @@ import { AbpValidationError } from './abp-validation.api';
1414
selector: 'abp-validation-summary',
1515
templateUrl: './abp-validation.summary.component.html'
1616
})
17-
export class AbpValidationSummaryComponent extends AppComponentBase
18-
implements OnInit {
19-
@Input() control: AbstractControl;
20-
@Input() controlEl: ElementRef;
21-
@Input() set customValidationErrors(val: AbpValidationError[]) {
22-
if (val && val.length > 0) {
23-
const defaults = this.defaultValidationErrors.filter(
24-
(defaultValidationError) =>
25-
!val.find(
26-
(customValidationError) =>
27-
customValidationError.name === defaultValidationError.name
28-
)
29-
);
30-
this.validationErrors = <AbpValidationError[]>[...defaults, ...val];
31-
}
32-
}
17+
export class AbpValidationSummaryComponent extends AppComponentBase implements OnInit {
3318

3419
defaultValidationErrors: Partial<AbpValidationError>[] = [
3520
{ name: 'required', localizationKey: 'ThisFieldIsRequired' },
@@ -59,6 +44,21 @@ export class AbpValidationSummaryComponent extends AppComponentBase
5944
];
6045
validationErrors = <AbpValidationError[]>this.defaultValidationErrors;
6146

47+
@Input() control: AbstractControl;
48+
@Input() controlEl: ElementRef;
49+
@Input() set customValidationErrors(val: AbpValidationError[]) {
50+
if (val && val.length > 0) {
51+
const defaults = this.defaultValidationErrors.filter(
52+
(defaultValidationError) =>
53+
!val.find(
54+
(customValidationError) =>
55+
customValidationError.name === defaultValidationError.name
56+
)
57+
);
58+
this.validationErrors = <AbpValidationError[]>[...defaults, ...val];
59+
}
60+
}
61+
6262
constructor(injector: Injector, public _renderer: Renderer2) {
6363
super(injector);
6464
}

0 commit comments

Comments
 (0)