Skip to content
This repository was archived by the owner on Apr 20, 2018. It is now read-only.

Commit 7ed4dd3

Browse files
Fixing Issue #537
1 parent 5a1704f commit 7ed4dd3

27 files changed

Lines changed: 211 additions & 65 deletions

dist/rx.all.compat.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4423,11 +4423,6 @@
44234423
return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
44244424
};
44254425

4426-
MapObservable.prototype.internalMapFilter = function (predicate, thisArg) {
4427-
var self = this;
4428-
return new FilterObservable(this.source, function (x, i, o) { return predicate(self.selector(x, i, o), i, o); }, thisArg);
4429-
};
4430-
44314426
MapObservable.prototype.subscribeCore = function (observer) {
44324427
return this.source.subscribe(new MapObserver(observer, this.selector, this));
44334428
};
@@ -4763,7 +4758,6 @@
47634758
*/
47644759
observableProto.filter = observableProto.where = function (predicate, thisArg) {
47654760
return this instanceof FilterObservable ? this.internalFilter(predicate, thisArg) :
4766-
this instanceof MapObservable ? this.internalMapFilter(predicate, thisArg) :
47674761
new FilterObservable(this, predicate, thisArg);
47684762
};
47694763

dist/rx.all.compat.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.all.compat.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.all.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4234,11 +4234,6 @@
42344234
return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
42354235
};
42364236

4237-
MapObservable.prototype.internalMapFilter = function (predicate, thisArg) {
4238-
var self = this;
4239-
return new FilterObservable(this.source, function (x, i, o) { return predicate(self.selector(x, i, o), i, o); }, thisArg);
4240-
};
4241-
42424237
MapObservable.prototype.subscribeCore = function (observer) {
42434238
return this.source.subscribe(new MapObserver(observer, this.selector, this));
42444239
};
@@ -4574,7 +4569,6 @@
45744569
*/
45754570
observableProto.filter = observableProto.where = function (predicate, thisArg) {
45764571
return this instanceof FilterObservable ? this.internalFilter(predicate, thisArg) :
4577-
this instanceof MapObservable ? this.internalMapFilter(predicate, thisArg) :
45784572
new FilterObservable(this, predicate, thisArg);
45794573
};
45804574

dist/rx.all.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.all.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.coincidence.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
observerCreate = Rx.Observer.create,
4646
addRef = Rx.internals.addRef,
4747
defaultComparer = Rx.internals.isEqual,
48+
inherits = Rx.internals.inherits,
4849
noop = Rx.helpers.noop,
4950
identity = Rx.helpers.identity,
5051
isPromise = Rx.helpers.isPromise,

dist/rx.coincidence.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.coincidence.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.compat.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4309,11 +4309,6 @@
43094309
return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
43104310
};
43114311

4312-
MapObservable.prototype.internalMapFilter = function (predicate, thisArg) {
4313-
var self = this;
4314-
return new FilterObservable(this.source, function (x, i, o) { return predicate(self.selector(x, i, o), i, o); }, thisArg);
4315-
};
4316-
43174312
MapObservable.prototype.subscribeCore = function (observer) {
43184313
return this.source.subscribe(new MapObserver(observer, this.selector, this));
43194314
};
@@ -4649,7 +4644,6 @@
46494644
*/
46504645
observableProto.filter = observableProto.where = function (predicate, thisArg) {
46514646
return this instanceof FilterObservable ? this.internalFilter(predicate, thisArg) :
4652-
this instanceof MapObservable ? this.internalMapFilter(predicate, thisArg) :
46534647
new FilterObservable(this, predicate, thisArg);
46544648
};
46554649

0 commit comments

Comments
 (0)