Skip to content

Commit

Permalink
Fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
nivekcode committed Aug 2, 2018
1 parent ebb5c6f commit 26a7faf
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {

Expand Down Expand Up @@ -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: () => {
}
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -132,7 +132,7 @@ export class AdvGrowlComponent implements OnInit, OnChanges {
}

getInifiniteStream(): Observable<any> {
return never();
return NEVER;
}

getFinitStream(messageId: string): Observable<string> {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';


Expand Down Expand Up @@ -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<AdvPrimeMessage> {
if (this.allocatedMessageSpots >= this.messageSpots) {
this.messageCache.push(messageWithSender.message)
return never()
return NEVER
} else {
this.allocatedMessageSpots++
return of(messageWithSender.message)
Expand Down
2 changes: 1 addition & 1 deletion projects/primeng-advanced-growl/src/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

export * from './lib/adv-growl.module';
export * from './lib/adv-growl.service';
export * from './lib/adv-growl.model';
export * from './lib/adv-growl.model';
6 changes: 4 additions & 2 deletions projects/primeng-advanced-growl/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

0 comments on commit 26a7faf

Please sign in to comment.