Merge pull request #646 from paulpdaniels/filter-map-thisarg-fix

Filter map ThisArg fix

Author: mattpodwysocki

src/core/perf/operators/filter.js

@@ -13,7 +13,7 @@
 
     FilterObservable.prototype.internalFilter = function(predicate, thisArg) {
       var self = this;
-      return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate(x, i, o); }, thisArg);
+      return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate.call(this, x, i, o); }, thisArg);
     };
 
     return FilterObservable;

src/core/perf/operators/map.js

@@ -9,7 +9,7 @@
 
     MapObservable.prototype.internalMap = function (selector, thisArg) {
       var self = this;
-      return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
+      return new MapObservable(this.source, function (x, i, o) { return selector.call(this, self.selector(x, i, o), i, o); }, thisArg)
     };
 
     MapObservable.prototype.subscribeCore = function (observer) {

tests/observable/controlled.js

@@ -216,4 +216,4 @@ test('controlled drops messages with queue disabled', function(){
     );
 
 
-});
+});

tests/observable/select.js

@@ -356,4 +356,38 @@
     equal(9, invoked2);
   });
 
+  test('Map and Map thisArg', function(){
+
+    var scheduler = new TestScheduler();
+
+    function Filterer() {
+      this.selector1 = function(item) {return item + 2};
+      this.selector2 = function(item) {return item * 3};
+    }
+
+    var filterer = new Filterer();
+
+    var xs = scheduler.createColdObservable(
+        onNext(10, 1),
+        onNext(20, 2),
+        onNext(30, 3),
+        onNext(40, 4),
+        onCompleted(100)
+    );
+
+    var results = scheduler.startWithCreate(function() {
+      return xs
+          .map(function(x){ return this.selector1(x);}, filterer)
+          .map(function(x){ return this.selector2(x);}, filterer)
+          .map(function(x){ return this.selector1(x);}, filterer);
+    });
+
+    results.messages.assertEqual(
+        onNext(210, 11),
+        onNext(220, 14),
+        onNext(230, 17),
+        onNext(240, 20),
+        onCompleted(300));
+  });
+
 }());

tests/observable/where.js

@@ -728,6 +728,40 @@
     equal(4, invoked2);
   });
 
+  test('Filter and Filter ThisArg', function() {
+    var scheduler = new TestScheduler();
+
+    function Filterer() {
+      this.filter1 = function(item) {return item % 2 == 0};
+      this.filter2 = function(item) {return item % 3 == 0};
+    }
+
+    var filterer = new Filterer();
+
+    var xs = scheduler.createColdObservable(
+        onNext(10, 1),
+        onNext(20, 2),
+        onNext(30, 3),
+        onNext(40, 4),
+        onNext(50, 5),
+        onNext(60, 6),
+        onNext(70, 7),
+        onNext(80, 8),
+        onNext(90, 9),
+        onCompleted(100)
+    );
+
+    var results = scheduler.startWithCreate(function() {
+      return xs
+          .filter(function(x){ return this.filter1(x);}, filterer)
+          .filter(function(x){ return this.filter2(x);}, filterer)
+          .filter(function(x){ return this.filter1(x);}, filterer);
+    });
+
+    results.messages.assertEqual(onNext(260, 6), onCompleted(300));
+
+  });
+
   test('Filter and Map Optimization', function () {
     var scheduler = new TestScheduler();