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

Commit 11cd57f

Browse files
mattpodwysockimattpodwysocki
committed
Updating to 4.1
1 parent c314375 commit 11cd57f

File tree

99 files changed

+2447
-978
lines changed

Some content is hidden

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

99 files changed

+2447
-978
lines changed

‎dist/rx.all.compat.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -4739,7 +4739,7 @@ observableProto.zipIterable = function () {
47394739
* @param {Number} [skip] Number of elements to skip between creation of consecutive buffers. If not provided, defaults to the count.
47404740
* @returns {Observable} An observable sequence of buffers.
47414741
*/
4742-
observableProto.bufferWithCount = function (count, skip) {
4742+
observableProto.bufferWithCount = observableProto.bufferCount = function (count, skip) {
47434743
typeof skip !== 'number' && (skip = count);
47444744
return this.windowWithCount(count, skip)
47454745
.flatMap(toArray)
@@ -5504,7 +5504,7 @@ observableProto.zipIterable = function () {
55045504
* @param {Number} [skip] Number of elements to skip between creation of consecutive windows. If not specified, defaults to the count.
55055505
* @returns {Observable} An observable sequence of windows.
55065506
*/
5507-
observableProto.windowWithCount = function (count, skip) {
5507+
observableProto.windowWithCount = observableProto.windowCount = function (count, skip) {
55085508
var source = this;
55095509
+count || (count = 0);
55105510
Math.abs(count) === Infinity && (count = 0);
@@ -5915,7 +5915,7 @@ observableProto.flatMapConcat = observableProto.concatMap = function(selector, r
59155915
return this.map(plucker(args, len));
59165916
};
59175917

5918-
observableProto.flatMap = observableProto.selectMany = function(selector, resultSelector, thisArg) {
5918+
observableProto.flatMap = observableProto.selectMany = observableProto.mergeMap = function(selector, resultSelector, thisArg) {
59195919
return new FlatMapObservable(this, selector, resultSelector, thisArg).mergeAll();
59205920
};
59215921

@@ -5971,9 +5971,10 @@ observableProto.flatMap = observableProto.selectMany = function(selector, result
59715971
}, source).mergeAll();
59725972
};
59735973

5974-
Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisArg) {
5974+
observableProto.flatMapLatest = observableProto.switchMap = function(selector, resultSelector, thisArg) {
59755975
return new FlatMapObservable(this, selector, resultSelector, thisArg).switchLatest();
59765976
};
5977+
59775978
var SkipObservable = (function(__super__) {
59785979
inherits(SkipObservable, __super__);
59795980
function SkipObservable(source, count) {
@@ -10165,7 +10166,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1016510166
* @param {Scheduler} [scheduler] Scheduler to run windowing timers on. If not specified, the timeout scheduler is used.
1016610167
* @returns {Observable} An observable sequence of windows.
1016710168
*/
10168-
observableProto.windowWithTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
10169+
observableProto.windowWithTime = observableProto.windowTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
1016910170
var source = this, timeShift;
1017010171
timeShiftOrScheduler == null && (timeShift = timeSpan);
1017110172
isScheduler(scheduler) || (scheduler = defaultScheduler);
@@ -10245,7 +10246,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1024510246
* @param {Scheduler} [scheduler] Scheduler to run windowing timers on. If not specified, the timeout scheduler is used.
1024610247
* @returns {Observable} An observable sequence of windows.
1024710248
*/
10248-
observableProto.windowWithTimeOrCount = function (timeSpan, count, scheduler) {
10249+
observableProto.windowWithTimeOrCount = observableProto.windowTimeOrCount = function (timeSpan, count, scheduler) {
1024910250
var source = this;
1025010251
isScheduler(scheduler) || (scheduler = defaultScheduler);
1025110252
return new AnonymousObservable(function (observer) {
@@ -10308,7 +10309,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1030810309
* @param {Scheduler} [scheduler] Scheduler to run buffer timers on. If not specified, the timeout scheduler is used.
1030910310
* @returns {Observable} An observable sequence of buffers.
1031010311
*/
10311-
observableProto.bufferWithTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
10312+
observableProto.bufferWithTime = observableProto.bufferTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
1031210313
return this.windowWithTime(timeSpan, timeShiftOrScheduler, scheduler).flatMap(toArray);
1031310314
};
1031410315

@@ -10321,7 +10322,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1032110322
* @param {Scheduler} [scheduler] Scheduler to run bufferin timers on. If not specified, the timeout scheduler is used.
1032210323
* @returns {Observable} An observable sequence of buffers.
1032310324
*/
10324-
observableProto.bufferWithTimeOrCount = function (timeSpan, count, scheduler) {
10325+
observableProto.bufferWithTimeOrCount = observableProto.bufferTimeOrCount = function (timeSpan, count, scheduler) {
1032510326
return this.windowWithTimeOrCount(timeSpan, count, scheduler).flatMap(toArray);
1032610327
};
1032710328

@@ -11261,13 +11262,14 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1126111262
return new SwitchFirstObservable(this);
1126211263
};
1126311264

11264-
observableProto.flatMapFirst = observableProto.selectManyFirst = function(selector, resultSelector, thisArg) {
11265+
observableProto.flatMapFirst = observableProto.exhaustMap = function(selector, resultSelector, thisArg) {
1126511266
return new FlatMapObservable(this, selector, resultSelector, thisArg).switchFirst();
1126611267
};
1126711268

11268-
Rx.Observable.prototype.flatMapWithMaxConcurrent = function(limit, selector, resultSelector, thisArg) {
11269+
observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent = function(limit, selector, resultSelector, thisArg) {
1126911270
return new FlatMapObservable(this, selector, resultSelector, thisArg).merge(limit);
1127011271
};
11272+
1127111273
var TransduceObserver = (function (__super__) {
1127211274
inherits(TransduceObserver, __super__);
1127311275
function TransduceObserver(o, xform) {

‎dist/rx.all.compat.map

+1-1
Large diffs are not rendered by default.

‎dist/rx.all.compat.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.all.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -4434,7 +4434,7 @@ observableProto.zipIterable = function () {
44344434
* @param {Number} [skip] Number of elements to skip between creation of consecutive buffers. If not provided, defaults to the count.
44354435
* @returns {Observable} An observable sequence of buffers.
44364436
*/
4437-
observableProto.bufferWithCount = function (count, skip) {
4437+
observableProto.bufferWithCount = observableProto.bufferCount = function (count, skip) {
44384438
typeof skip !== 'number' && (skip = count);
44394439
return this.windowWithCount(count, skip)
44404440
.flatMap(toArray)
@@ -5199,7 +5199,7 @@ observableProto.zipIterable = function () {
51995199
* @param {Number} [skip] Number of elements to skip between creation of consecutive windows. If not specified, defaults to the count.
52005200
* @returns {Observable} An observable sequence of windows.
52015201
*/
5202-
observableProto.windowWithCount = function (count, skip) {
5202+
observableProto.windowWithCount = observableProto.windowCount = function (count, skip) {
52035203
var source = this;
52045204
+count || (count = 0);
52055205
Math.abs(count) === Infinity && (count = 0);
@@ -5653,7 +5653,7 @@ observableProto.zipIterable = function () {
56535653
return this.map(plucker(args, len));
56545654
};
56555655

5656-
observableProto.flatMap = observableProto.selectMany = function(selector, resultSelector, thisArg) {
5656+
observableProto.flatMap = observableProto.selectMany = observableProto.mergeMap = function(selector, resultSelector, thisArg) {
56575657
return new FlatMapObservable(this, selector, resultSelector, thisArg).mergeAll();
56585658
};
56595659

@@ -5709,9 +5709,10 @@ observableProto.flatMap = observableProto.selectMany = function(selector, result
57095709
}, source).mergeAll();
57105710
};
57115711

5712-
Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisArg) {
5712+
observableProto.flatMapLatest = observableProto.switchMap = function(selector, resultSelector, thisArg) {
57135713
return new FlatMapObservable(this, selector, resultSelector, thisArg).switchLatest();
57145714
};
5715+
57155716
var SkipObservable = (function(__super__) {
57165717
inherits(SkipObservable, __super__);
57175718
function SkipObservable(source, count) {
@@ -9903,7 +9904,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
99039904
* @param {Scheduler} [scheduler] Scheduler to run windowing timers on. If not specified, the timeout scheduler is used.
99049905
* @returns {Observable} An observable sequence of windows.
99059906
*/
9906-
observableProto.windowWithTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
9907+
observableProto.windowWithTime = observableProto.windowTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
99079908
var source = this, timeShift;
99089909
timeShiftOrScheduler == null && (timeShift = timeSpan);
99099910
isScheduler(scheduler) || (scheduler = defaultScheduler);
@@ -9983,7 +9984,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
99839984
* @param {Scheduler} [scheduler] Scheduler to run windowing timers on. If not specified, the timeout scheduler is used.
99849985
* @returns {Observable} An observable sequence of windows.
99859986
*/
9986-
observableProto.windowWithTimeOrCount = function (timeSpan, count, scheduler) {
9987+
observableProto.windowWithTimeOrCount = observableProto.windowTimeOrCount = function (timeSpan, count, scheduler) {
99879988
var source = this;
99889989
isScheduler(scheduler) || (scheduler = defaultScheduler);
99899990
return new AnonymousObservable(function (observer) {
@@ -10046,7 +10047,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1004610047
* @param {Scheduler} [scheduler] Scheduler to run buffer timers on. If not specified, the timeout scheduler is used.
1004710048
* @returns {Observable} An observable sequence of buffers.
1004810049
*/
10049-
observableProto.bufferWithTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
10050+
observableProto.bufferWithTime = observableProto.bufferTime = function (timeSpan, timeShiftOrScheduler, scheduler) {
1005010051
return this.windowWithTime(timeSpan, timeShiftOrScheduler, scheduler).flatMap(toArray);
1005110052
};
1005210053

@@ -10059,7 +10060,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1005910060
* @param {Scheduler} [scheduler] Scheduler to run bufferin timers on. If not specified, the timeout scheduler is used.
1006010061
* @returns {Observable} An observable sequence of buffers.
1006110062
*/
10062-
observableProto.bufferWithTimeOrCount = function (timeSpan, count, scheduler) {
10063+
observableProto.bufferWithTimeOrCount = observableProto.bufferTimeOrCount = function (timeSpan, count, scheduler) {
1006310064
return this.windowWithTimeOrCount(timeSpan, count, scheduler).flatMap(toArray);
1006410065
};
1006510066

@@ -11048,13 +11049,14 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1104811049
return new SwitchFirstObservable(this);
1104911050
};
1105011051

11051-
observableProto.flatMapFirst = observableProto.selectManyFirst = function(selector, resultSelector, thisArg) {
11052+
observableProto.flatMapFirst = observableProto.exhaustMap = function(selector, resultSelector, thisArg) {
1105211053
return new FlatMapObservable(this, selector, resultSelector, thisArg).switchFirst();
1105311054
};
1105411055

11055-
Rx.Observable.prototype.flatMapWithMaxConcurrent = function(limit, selector, resultSelector, thisArg) {
11056+
observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent = function(limit, selector, resultSelector, thisArg) {
1105611057
return new FlatMapObservable(this, selector, resultSelector, thisArg).merge(limit);
1105711058
};
11059+
1105811060
/** Provides a set of extension methods for virtual time scheduling. */
1105911061
var VirtualTimeScheduler = Rx.VirtualTimeScheduler = (function (__super__) {
1106011062
inherits(VirtualTimeScheduler, __super__);

‎dist/rx.all.map

+1-1
Large diffs are not rendered by default.

‎dist/rx.all.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.compat.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -4739,7 +4739,7 @@ observableProto.zipIterable = function () {
47394739
* @param {Number} [skip] Number of elements to skip between creation of consecutive buffers. If not provided, defaults to the count.
47404740
* @returns {Observable} An observable sequence of buffers.
47414741
*/
4742-
observableProto.bufferWithCount = function (count, skip) {
4742+
observableProto.bufferWithCount = observableProto.bufferCount = function (count, skip) {
47434743
typeof skip !== 'number' && (skip = count);
47444744
return this.windowWithCount(count, skip)
47454745
.flatMap(toArray)
@@ -5504,7 +5504,7 @@ observableProto.zipIterable = function () {
55045504
* @param {Number} [skip] Number of elements to skip between creation of consecutive windows. If not specified, defaults to the count.
55055505
* @returns {Observable} An observable sequence of windows.
55065506
*/
5507-
observableProto.windowWithCount = function (count, skip) {
5507+
observableProto.windowWithCount = observableProto.windowCount = function (count, skip) {
55085508
var source = this;
55095509
+count || (count = 0);
55105510
Math.abs(count) === Infinity && (count = 0);
@@ -5813,7 +5813,7 @@ observableProto.flatMapConcat = observableProto.concatMap = function(selector, r
58135813
return this.map(plucker(args, len));
58145814
};
58155815

5816-
observableProto.flatMap = observableProto.selectMany = function(selector, resultSelector, thisArg) {
5816+
observableProto.flatMap = observableProto.selectMany = observableProto.mergeMap = function(selector, resultSelector, thisArg) {
58175817
return new FlatMapObservable(this, selector, resultSelector, thisArg).mergeAll();
58185818
};
58195819

@@ -5869,9 +5869,10 @@ observableProto.flatMap = observableProto.selectMany = function(selector, result
58695869
}, source).mergeAll();
58705870
};
58715871

5872-
Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisArg) {
5872+
observableProto.flatMapLatest = observableProto.switchMap = function(selector, resultSelector, thisArg) {
58735873
return new FlatMapObservable(this, selector, resultSelector, thisArg).switchLatest();
58745874
};
5875+
58755876
var SkipObservable = (function(__super__) {
58765877
inherits(SkipObservable, __super__);
58775878
function SkipObservable(source, count) {

‎dist/rx.compat.map

+1-1
Large diffs are not rendered by default.

‎dist/rx.compat.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.experimental.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -578,12 +578,13 @@
578578
return new SwitchFirstObservable(this);
579579
};
580580

581-
observableProto.flatMapFirst = observableProto.selectManyFirst = function(selector, resultSelector, thisArg) {
581+
observableProto.flatMapFirst = observableProto.exhaustMap = function(selector, resultSelector, thisArg) {
582582
return new FlatMapObservable(this, selector, resultSelector, thisArg).switchFirst();
583583
};
584584

585-
Rx.Observable.prototype.flatMapWithMaxConcurrent = function(limit, selector, resultSelector, thisArg) {
585+
observableProto.flatMapWithMaxConcurrent = observableProto.flatMapMaxConcurrent = function(limit, selector, resultSelector, thisArg) {
586586
return new FlatMapObservable(this, selector, resultSelector, thisArg).merge(limit);
587587
};
588+
588589
return Rx;
589590
}));

0 commit comments

Comments
 (0)