Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(takeWhile): remove thisArg #882

Closed
wants to merge 1 commit into from
Closed

feat(takeWhile): remove thisArg #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions spec/operators/takeWhile-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,23 +154,6 @@ describe('Observable.prototype.takeWhile()', function () {
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should pass element thisArg to predicate', function () {
var e1 = hot('--a-^-b--c--d--e--|');
var e1subs = '^ ! ';
var expected = '--b--c--| ';

function predicate() {
this.take = function (value) {
return value !== 'd';
};
}

var result = e1.takeWhile(function (v) { return this.take(v); }, new predicate());

expectObservable(result).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});

it('should take elements until unsubscribed', function () {
var e1 = hot('--a-^-b--c--d--e--|');
var unsub = '-----! ';
Expand Down
2 changes: 1 addition & 1 deletion src/CoreOperators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export interface CoreOperators<T> {
switchMapTo?: <R>(observable: Observable<any>, projectResult?: (x: T, y: any, ix: number, iy: number) => R) => Observable<R>;
take?: (count: number) => Observable<T>;
takeUntil?: (notifier: Observable<any>) => Observable<T>;
takeWhile?: (predicate: (value: T, index: number) => boolean, thisArg?: any) => Observable<T>;
takeWhile?: (predicate: (value: T, index: number) => boolean) => Observable<T>;
throttle?: (durationSelector: (value: T) => Observable<any> | Promise<any>) => Observable<T>;
throttleTime?: (delay: number, scheduler?: Scheduler) => Observable<T>;
timeout?: (due: number | Date, errorToSend?: any, scheduler?: Scheduler) => Observable<T>;
Expand Down
2 changes: 1 addition & 1 deletion src/Observable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export class Observable<T> implements CoreOperators<T> {
switchMapTo: <R>(observable: Observable<any>, projectResult?: (x: T, y: any, ix: number, iy: number) => R) => Observable<R>;
take: (count: number) => Observable<T>;
takeUntil: (notifier: Observable<any>) => Observable<T>;
takeWhile: (predicate: (value: T, index: number) => boolean, thisArg?: any) => Observable<T>;
takeWhile: (predicate: (value: T, index: number) => boolean) => Observable<T>;
throttle: (durationSelector: (value: T) => Observable<any> | Promise<any>) => Observable<T>;
throttleTime: (delay: number, scheduler?: Scheduler) => Observable<T>;
timeout: (due: number | Date, errorToSend?: any, scheduler?: Scheduler) => Observable<T>;
Expand Down
18 changes: 5 additions & 13 deletions src/operator/takeWhile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,26 @@ import {Observable} from '../Observable';
import {Subscriber} from '../Subscriber';
import {tryCatch} from '../util/tryCatch';
import {errorObject} from '../util/errorObject';
import {bindCallback} from '../util/bindCallback';

export function takeWhile<T>(predicate: (value: T, index: number) => boolean,
thisArg?: any): Observable<T> {
return this.lift(new TakeWhileOperator(predicate, thisArg));
export function takeWhile<T>(predicate: (value: T, index: number) => boolean): Observable<T> {
return this.lift(new TakeWhileOperator(predicate));
}

class TakeWhileOperator<T, R> implements Operator<T, R> {
constructor(private predicate: (value: T, index: number) => boolean,
private thisArg?: any) {
constructor(private predicate: (value: T, index: number) => boolean) {
}

call(subscriber: Subscriber<T>): Subscriber<T> {
return new TakeWhileSubscriber(subscriber, this.predicate, this.thisArg);
return new TakeWhileSubscriber(subscriber, this.predicate);
}
}

class TakeWhileSubscriber<T> extends Subscriber<T> {
private predicate: (value: T, index: number) => boolean;
private index: number = 0;

constructor(destination: Subscriber<T>,
predicate: (value: T, index: number) => boolean,
thisArg?: any) {
private predicate: (value: T, index: number) => boolean) {
super(destination);
if (typeof predicate === 'function') {
this.predicate = <(value: T, index: number) => boolean>bindCallback(predicate, thisArg, 2);
}
}

_next(value: T): void {
Expand Down