From d8f7297a6d5ad2127e803cc2b481989dbf4189d6 Mon Sep 17 00:00:00 2001
From: Ben Lesh <blesh@netflix.com>
Date: Tue, 8 Dec 2015 11:09:23 -0800
Subject: [PATCH] refactor(skipWhile): remove thisArg argument

- removes thisArg and tests around that from skipWhile
- removes extra thisArg on interface defs for first and last as well

BREAKING CHANGE: skipWhile no longer accepts a thisArg argument
related #878
---
 spec/operators/skipWhile-spec.js | 17 -----------------
 src/CoreOperators.ts             |  6 +++---
 src/operator/skipWhile.ts        | 10 +++-------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/spec/operators/skipWhile-spec.js b/spec/operators/skipWhile-spec.js
index 83aea05bfe..9888d5104f 100644
--- a/spec/operators/skipWhile-spec.js
+++ b/spec/operators/skipWhile-spec.js
@@ -160,23 +160,6 @@ describe('Observable.prototype.skipWhile()', function () {
     expectSubscriptions(source.subscriptions).toBe(sourceSubs);
   });
 
-  it('should accept a thisArg', function () {
-    var source = hot('-1-^--2--3--4--5--6--|');
-    var sourceSubs =    '^                 !';
-    var expected =      '---------4--5--6--|';
-
-    function Skiper() {
-      this.doSkip = function (v) { return +v < 4; };
-    }
-
-    var skiper = new Skiper();
-
-    expectObservable(
-      source.skipWhile(function (v) { return this.doSkip(v); }, skiper)
-    ).toBe(expected);
-    expectSubscriptions(source.subscriptions).toBe(sourceSubs);
-  });
-
   it('should handle Observable.empty', function () {
     var source = cold('|');
     var subs =        '(^!)';
diff --git a/src/CoreOperators.ts b/src/CoreOperators.ts
index 433f5ad6fc..60e595de1a 100644
--- a/src/CoreOperators.ts
+++ b/src/CoreOperators.ts
@@ -30,7 +30,7 @@ export interface CoreOperators<T> {
   filter?: (predicate: (x: T) => boolean, ix?: number, thisArg?: any) => Observable<T>;
   finally?: (finallySelector: () => void) => Observable<T>;
   first?: <R>(predicate?: (value: T, index: number, source: Observable<T>) => boolean,
-              resultSelector?: (value: T, index: number) => R, thisArg?: any, defaultValue?: any) => Observable<T> | Observable<R>;
+              resultSelector?: (value: T, index: number) => R, defaultValue?: any) => Observable<T> | Observable<R>;
   flatMap?: <R>(project: ((x: T, ix: number) => Observable<any>),
                 projectResult?: (x: T, y: any, ix: number, iy: number) => R,
                 concurrent?: number) => Observable<R>;
@@ -41,7 +41,7 @@ export interface CoreOperators<T> {
   ignoreElements?: () => Observable<T>;
   last?: <R>(predicate?: (value: T, index: number) => boolean,
              resultSelector?: (value: T, index: number) => R,
-             thisArg?: any, defaultValue?: any) => Observable<T> | Observable<R>;
+             defaultValue?: any) => Observable<T> | Observable<R>;
   every?: (predicate: (value: T, index: number) => boolean, thisArg?: any) => Observable<T>;
   map?: <R>(project: (x: T, ix?: number) => R, thisArg?: any) => Observable<R>;
   mapTo?: <R>(value: R) => Observable<R>;
@@ -69,7 +69,7 @@ export interface CoreOperators<T> {
   single?: (predicate?: (value: T, index: number) => boolean) => Observable<T>;
   skip?: (count: number) => Observable<T>;
   skipUntil?: (notifier: Observable<any>) => Observable<T>;
-  skipWhile?: (predicate: (x: T, index: number) => boolean, thisArg?: any) => Observable<T>;
+  skipWhile?: (predicate: (x: T, index: number) => boolean) => Observable<T>;
   startWith?: (x: T) => Observable<T>;
   subscribeOn?: (scheduler: Scheduler, delay?: number) => Observable<T>;
   switch?: () => Observable<T>;
diff --git a/src/operator/skipWhile.ts b/src/operator/skipWhile.ts
index 46365645da..f0dc49d720 100644
--- a/src/operator/skipWhile.ts
+++ b/src/operator/skipWhile.ts
@@ -3,17 +3,13 @@ import {Operator} from '../Operator';
 import {Subscriber} from '../Subscriber';
 import {tryCatch} from '../util/tryCatch';
 import {errorObject} from '../util/errorObject';
-import {bindCallback} from '../util/bindCallback';
 
-export function skipWhile<T>(predicate: (x: T, index: number) => boolean, thisArg?: any): Observable<T> {
-  return this.lift(new SkipWhileOperator(predicate, thisArg));
+export function skipWhile<T>(predicate: (x: T, index: number) => boolean): Observable<T> {
+  return this.lift(new SkipWhileOperator(predicate));
 }
 
 class SkipWhileOperator<T, R> implements Operator<T, R> {
-  private predicate: (x: T, index: number) => boolean;
-
-  constructor(predicate: (x: T, index: number) => boolean, thisArg?: any) {
-    this.predicate = <(x: T, index: number) => boolean>bindCallback(predicate, thisArg, 2);
+  constructor(private predicate: (x: T, index: number) => boolean) {
   }
 
   call(subscriber: Subscriber<T>): Subscriber<T> {