From 26a7fafc989856be156598e87129dfd4651e847e Mon Sep 17 00:00:00 2001 From: kreuzerk Date: Thu, 2 Aug 2018 08:48:46 +0200 Subject: [PATCH] Fix linting errors --- .../src/lib/adv-growl.component.spec.ts | 8 ++++---- .../primeng-advanced-growl/src/lib/adv-growl.component.ts | 4 ++-- .../src/lib/adv-growl.hoverHelper.ts | 6 +++--- .../src/lib/adv-growl.messageCache.ts | 6 +++--- projects/primeng-advanced-growl/src/public_api.ts | 2 +- projects/primeng-advanced-growl/tslint.json | 6 ++++-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/projects/primeng-advanced-growl/src/lib/adv-growl.component.spec.ts b/projects/primeng-advanced-growl/src/lib/adv-growl.component.spec.ts index d8b706f..0a8cfc6 100644 --- a/projects/primeng-advanced-growl/src/lib/adv-growl.component.spec.ts +++ b/projects/primeng-advanced-growl/src/lib/adv-growl.component.spec.ts @@ -7,7 +7,7 @@ import {AdvGrowlComponent} from './adv-growl.component'; import {AdvGrowlService} from './adv-growl.service'; import {AdvPrimeMessage} from './adv-growl.model'; import {EventEmitter, SimpleChange} from '@angular/core'; -import {never, Observable, of} from 'rxjs'; +import {Observable, of, NEVER} from 'rxjs'; describe('Message Component', () => { @@ -63,7 +63,7 @@ describe('Message Component', () => { }); }); spyOn(messagesService, 'getMessageStream'); - spyOn(messagesService, 'getCancelStream').and.returnValue(never()); + spyOn(messagesService, 'getCancelStream').and.returnValue(NEVER); component.messageCache = { getMessages: () => { } @@ -130,7 +130,7 @@ describe('Message Component', () => { numberOfCalls++; return of(1); } - return never(); + return NEVER; }); spyOn(component, 'getLifeTimeStream').and.returnValue(of(1)); spyOn(Array.prototype, 'shift'); @@ -276,7 +276,7 @@ describe('Message Component', () => { component.pauseOnlyHoveredMessage = pauseOnlyHovered; component.hoverHelper = { - getPausableMessageStream: (param1, param2) => of(1) + getPausableMessageStream: () => of(1) } as any; spyOn(component.hoverHelper, 'getPausableMessageStream').and.returnValue(of(1)); diff --git a/projects/primeng-advanced-growl/src/lib/adv-growl.component.ts b/projects/primeng-advanced-growl/src/lib/adv-growl.component.ts index 8689a74..e8af3fc 100644 --- a/projects/primeng-advanced-growl/src/lib/adv-growl.component.ts +++ b/projects/primeng-advanced-growl/src/lib/adv-growl.component.ts @@ -17,7 +17,7 @@ import {AdvPrimeMessage} from './adv-growl.model'; import {AdvGrowlService} from './adv-growl.service'; import {AdvGrowlHoverHelper} from './adv-growl.hoverHelper'; import {AdvGrowlMessageCache} from './adv-growl.messageCache'; -import {fromEvent, merge, never, Observable, Observer, Subject, timer} from 'rxjs'; +import {fromEvent, merge, Observable, Observer, Subject, timer, NEVER} from 'rxjs'; const DEFAULT_LIFETIME = 0; const FREEZE_MESSAGES_DEFAULT = false; @@ -132,7 +132,7 @@ export class AdvGrowlComponent implements OnInit, OnChanges { } getInifiniteStream(): Observable { - return never(); + return NEVER; } getFinitStream(messageId: string): Observable { diff --git a/projects/primeng-advanced-growl/src/lib/adv-growl.hoverHelper.ts b/projects/primeng-advanced-growl/src/lib/adv-growl.hoverHelper.ts index c5c5400..0134b3c 100644 --- a/projects/primeng-advanced-growl/src/lib/adv-growl.hoverHelper.ts +++ b/projects/primeng-advanced-growl/src/lib/adv-growl.hoverHelper.ts @@ -1,7 +1,7 @@ /** * Created by kevinkreuzer on 08.07.17. */ -import {interval, merge, never, Observable} from 'rxjs'; +import {interval, merge, NEVER, Observable} from 'rxjs'; import {dematerialize, last, mapTo, materialize, startWith, switchMap, takeWhile, tap} from 'rxjs/operators'; export const MOUSE_LEFT_ID = 'MOUSE_LEFT_ID'; @@ -22,11 +22,11 @@ export class AdvGrowlHoverHelper { return this.messageHover$.pipe(switchMap((hoveredMessageId: string) => { if (this.isMessageEntered(hoveredMessageId) && !pauseOnlyHovered) { - return never().pipe(materialize()) + return NEVER.pipe(materialize()) } if (hoveredMessageId === messageId) { - return never().pipe(materialize()) + return NEVER.pipe(materialize()) } return interval(STEP_TIME_UNIT).pipe( tap(() => lifeTime -= STEP_TIME_UNIT), diff --git a/projects/primeng-advanced-growl/src/lib/adv-growl.messageCache.ts b/projects/primeng-advanced-growl/src/lib/adv-growl.messageCache.ts index 2e0a871..3f4e9ae 100644 --- a/projects/primeng-advanced-growl/src/lib/adv-growl.messageCache.ts +++ b/projects/primeng-advanced-growl/src/lib/adv-growl.messageCache.ts @@ -2,7 +2,7 @@ * Created by kevinkreuzer on 16.10.17. */ import {AdvPrimeMessage} from './adv-growl.model'; -import {merge, never, Observable, of, Subject} from 'rxjs'; +import {merge, Observable, of, NEVER, Subject} from 'rxjs'; import {map, switchMap} from 'rxjs/operators'; @@ -57,14 +57,14 @@ export class AdvGrowlMessageCache { this.allocatedMessageSpots++ return of(messageWithSender.message) case MESSAGE_SENDER.SCHREDDER: - return never() + return NEVER } } getUserMessage(messageWithSender: MessageWithSender): Observable { if (this.allocatedMessageSpots >= this.messageSpots) { this.messageCache.push(messageWithSender.message) - return never() + return NEVER } else { this.allocatedMessageSpots++ return of(messageWithSender.message) diff --git a/projects/primeng-advanced-growl/src/public_api.ts b/projects/primeng-advanced-growl/src/public_api.ts index ddfa009..838d9c2 100644 --- a/projects/primeng-advanced-growl/src/public_api.ts +++ b/projects/primeng-advanced-growl/src/public_api.ts @@ -4,4 +4,4 @@ export * from './lib/adv-growl.module'; export * from './lib/adv-growl.service'; -export * from './lib/adv-growl.model'; \ No newline at end of file +export * from './lib/adv-growl.model'; diff --git a/projects/primeng-advanced-growl/tslint.json b/projects/primeng-advanced-growl/tslint.json index af674f9..59ad1b4 100644 --- a/projects/primeng-advanced-growl/tslint.json +++ b/projects/primeng-advanced-growl/tslint.json @@ -10,9 +10,11 @@ "component-selector": [ true, "element", - "pag", + "adv", "kebab-case" ], - "semicolon": false + "semicolon": false, + "no-input-rename": false, + "no-output-on-prefix": false } }