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

Commit d8dbfc3

Browse files
Fixing Issue #650
1 parent 0c6ed4a commit d8dbfc3

70 files changed

Lines changed: 1071 additions & 140 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rxjs",
3-
"version": "2.4.8",
3+
"version": "2.4.9",
44
"main": [
55
"dist/rx.all.js",
66
"dist/rx.all.map",

dist/rx.all.compat.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@
14461446
return currentScheduler;
14471447
}());
14481448

1449-
var scheduleMethod;
1449+
var scheduleMethod, clearMethod;
14501450

14511451
var localTimer = (function () {
14521452
var localSetTimeout, localClearTimeout = noop;
@@ -1474,9 +1474,9 @@
14741474

14751475
var nextHandle = 1, tasksByHandle = {}, currentlyRunning = false;
14761476

1477-
function clearMethod(handle) {
1477+
clearMethod = function (handle) {
14781478
delete tasksByHandle[handle];
1479-
}
1479+
};
14801480

14811481
function runTask(handle) {
14821482
if (currentlyRunning) {
@@ -4739,7 +4739,7 @@
47394739

47404740
MapObservable.prototype.internalMap = function (selector, thisArg) {
47414741
var self = this;
4742-
return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
4742+
return new MapObservable(this.source, function (x, i, o) { return selector.call(this, self.selector(x, i, o), i, o); }, thisArg)
47434743
};
47444744

47454745
MapObservable.prototype.subscribeCore = function (observer) {
@@ -4765,12 +4765,6 @@
47654765
return this.observer.onError(result.e);
47664766
}
47674767
this.observer.onNext(result);
4768-
/*try {
4769-
var result = this.selector(x, this.i++, this.source);
4770-
} catch (e) {
4771-
return this.observer.onError(e);
4772-
}
4773-
this.observer.onNext(result);*/
47744768
};
47754769
MapObserver.prototype.onError = function (e) {
47764770
if(!this.isStopped) { this.isStopped = true; this.observer.onError(e); }
@@ -5053,7 +5047,7 @@
50535047

50545048
FilterObservable.prototype.internalFilter = function(predicate, thisArg) {
50555049
var self = this;
5056-
return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate(x, i, o); }, thisArg);
5050+
return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate.call(this, x, i, o); }, thisArg);
50575051
};
50585052

50595053
return FilterObservable;
@@ -9397,9 +9391,12 @@
93979391
}, source);
93989392
};
93999393

9400-
observableProto.throttleWithSelector = function () {
9394+
/**
9395+
* @deprecated use #debounceWithSelector instead.
9396+
*/
9397+
observableProto.throttleWithSelector = function (durationSelector) {
94019398
//deprecate('throttleWithSelector', 'debounceWithSelector');
9402-
return this.debounceWithSelector.apply(this, arguments);
9399+
return this.debounceWithSelector(durationSelector);
94039400
};
94049401

94059402
/**

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: 4 additions & 4 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: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@
12551255
return currentScheduler;
12561256
}());
12571257

1258-
var scheduleMethod;
1258+
var scheduleMethod, clearMethod;
12591259

12601260
var localTimer = (function () {
12611261
var localSetTimeout, localClearTimeout = noop;
@@ -1283,9 +1283,9 @@
12831283

12841284
var nextHandle = 1, tasksByHandle = {}, currentlyRunning = false;
12851285

1286-
function clearMethod(handle) {
1286+
clearMethod = function (handle) {
12871287
delete tasksByHandle[handle];
1288-
}
1288+
};
12891289

12901290
function runTask(handle) {
12911291
if (currentlyRunning) {
@@ -4594,7 +4594,7 @@
45944594

45954595
MapObservable.prototype.internalMap = function (selector, thisArg) {
45964596
var self = this;
4597-
return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
4597+
return new MapObservable(this.source, function (x, i, o) { return selector.call(this, self.selector(x, i, o), i, o); }, thisArg)
45984598
};
45994599

46004600
MapObservable.prototype.subscribeCore = function (observer) {
@@ -4620,12 +4620,6 @@
46204620
return this.observer.onError(result.e);
46214621
}
46224622
this.observer.onNext(result);
4623-
/*try {
4624-
var result = this.selector(x, this.i++, this.source);
4625-
} catch (e) {
4626-
return this.observer.onError(e);
4627-
}
4628-
this.observer.onNext(result);*/
46294623
};
46304624
MapObserver.prototype.onError = function (e) {
46314625
if(!this.isStopped) { this.isStopped = true; this.observer.onError(e); }
@@ -4908,7 +4902,7 @@
49084902

49094903
FilterObservable.prototype.internalFilter = function(predicate, thisArg) {
49104904
var self = this;
4911-
return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate(x, i, o); }, thisArg);
4905+
return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate.call(this, x, i, o); }, thisArg);
49124906
};
49134907

49144908
return FilterObservable;
@@ -9184,9 +9178,12 @@
91849178
}, source);
91859179
};
91869180

9187-
observableProto.throttleWithSelector = function () {
9181+
/**
9182+
* @deprecated use #debounceWithSelector instead.
9183+
*/
9184+
observableProto.throttleWithSelector = function (durationSelector) {
91889185
//deprecate('throttleWithSelector', 'debounceWithSelector');
9189-
return this.debounceWithSelector.apply(this, arguments);
9186+
return this.debounceWithSelector(durationSelector);
91909187
};
91919188

91929189
/**

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: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rx.compat.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@
14461446
return currentScheduler;
14471447
}());
14481448

1449-
var scheduleMethod;
1449+
var scheduleMethod, clearMethod;
14501450

14511451
var localTimer = (function () {
14521452
var localSetTimeout, localClearTimeout = noop;
@@ -1474,9 +1474,9 @@
14741474

14751475
var nextHandle = 1, tasksByHandle = {}, currentlyRunning = false;
14761476

1477-
function clearMethod(handle) {
1477+
clearMethod = function (handle) {
14781478
delete tasksByHandle[handle];
1479-
}
1479+
};
14801480

14811481
function runTask(handle) {
14821482
if (currentlyRunning) {
@@ -4625,7 +4625,7 @@
46254625

46264626
MapObservable.prototype.internalMap = function (selector, thisArg) {
46274627
var self = this;
4628-
return new MapObservable(this.source, function (x, i, o) { return selector(self.selector(x, i, o), i, o); }, thisArg)
4628+
return new MapObservable(this.source, function (x, i, o) { return selector.call(this, self.selector(x, i, o), i, o); }, thisArg)
46294629
};
46304630

46314631
MapObservable.prototype.subscribeCore = function (observer) {
@@ -4651,12 +4651,6 @@
46514651
return this.observer.onError(result.e);
46524652
}
46534653
this.observer.onNext(result);
4654-
/*try {
4655-
var result = this.selector(x, this.i++, this.source);
4656-
} catch (e) {
4657-
return this.observer.onError(e);
4658-
}
4659-
this.observer.onNext(result);*/
46604654
};
46614655
MapObserver.prototype.onError = function (e) {
46624656
if(!this.isStopped) { this.isStopped = true; this.observer.onError(e); }
@@ -4939,7 +4933,7 @@
49394933

49404934
FilterObservable.prototype.internalFilter = function(predicate, thisArg) {
49414935
var self = this;
4942-
return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate(x, i, o); }, thisArg);
4936+
return new FilterObservable(this.source, function(x, i, o) { return self.predicate(x, i, o) && predicate.call(this, x, i, o); }, thisArg);
49434937
};
49444938

49454939
return FilterObservable;

dist/rx.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.compat.min.js

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

0 commit comments

Comments
 (0)