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

Commit 8977f7c

Browse files
mattpodwysockimattpodwysocki
committed
Fixing Issue #657 
1 parent 34852fc commit 8977f7c

81 files changed

Lines changed: 191 additions & 159 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.

‎Gruntfile.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = function (grunt) {
2222
src: [
2323
'src/core/headers/license.js',
2424
'src/core/headers/intro.js',
25-
'src/core/headers/basicheader-modern.js',
25+
'src/core/headers/basicheader.js',
2626

2727
// Stack trace start
2828
'src/core/longstacktraces/longstackbegin.js',
@@ -317,7 +317,7 @@ module.exports = function (grunt) {
317317
src: [
318318
'src/core/headers/license.js',
319319
'src/core/headers/intro.js',
320-
'src/core/headers/basicheader.js',
320+
'src/core/headers/basicheader-compat.js',
321321

322322
// Stack trace start
323323
'src/core/longstacktraces/longstackbegin.js',
@@ -610,7 +610,7 @@ module.exports = function (grunt) {
610610
src: [
611611
'src/core/headers/license.js',
612612
'src/core/headers/intro.js',
613-
'src/core/headers/basicheader-modern.js',
613+
'src/core/headers/basicheader.js',
614614

615615
// Stack trace start
616616
'src/core/longstacktraces/longstackbegin.js',
@@ -759,7 +759,7 @@ module.exports = function (grunt) {
759759
src: [
760760
'src/core/headers/license.js',
761761
'src/core/headers/intro.js',
762-
'src/core/headers/basicheader.js',
762+
'src/core/headers/basicheader-compat.js',
763763

764764
// Stack trace start
765765
'src/core/longstacktraces/longstackbegin.js',
@@ -1283,7 +1283,7 @@ module.exports = function (grunt) {
12831283
'lite-extras-compat': {
12841284
src: [
12851285
'src/core/headers/license.js',
1286-
'src/core/headers/litecompatintro.js',
1286+
'src/core/headers/liteintro-compat.js',
12871287
'src/core/headers/liteextrasheader.js',
12881288

12891289
'src/core/disposables/scheduleddisposable.js',
@@ -1353,7 +1353,7 @@ module.exports = function (grunt) {
13531353
'backpressure-lite-compat': {
13541354
src: [
13551355
'src/core/headers/license.js',
1356-
'src/core/headers/litecompatintro.js',
1356+
'src/core/headers/liteintro-compat.js',
13571357
'src/core/headers/backpressureheader.js',
13581358

13591359
// Backpressure operators
@@ -1453,7 +1453,7 @@ module.exports = function (grunt) {
14531453
'aggregates-lite-compat': {
14541454
src: [
14551455
'src/core/headers/license.js',
1456-
'src/core/headers/litecompatintro.js',
1456+
'src/core/headers/liteintro-compat.js',
14571457
'src/core/headers/aggregatesheader.js',
14581458
'src/core/linq/observable/_extremaby.js',
14591459
'src/core/linq/observable/_firstonly.js',
@@ -1542,7 +1542,7 @@ module.exports = function (grunt) {
15421542
'async-lite-compat': {
15431543
src: [
15441544
'src/core/headers/license.js',
1545-
'src/core/headers/litecompatintro.js',
1545+
'src/core/headers/liteintro-compat.js',
15461546
'src/core/headers/asyncheader.js',
15471547
'src/core/linq/observable/spawn.js',
15481548
'src/core/linq/observable/start.js', // toasync
@@ -1613,7 +1613,7 @@ module.exports = function (grunt) {
16131613
'coincidence-lite-compat': {
16141614
src: [
16151615
'src/core/headers/license.js',
1616-
'src/core/headers/litecompatintro.js',
1616+
'src/core/headers/liteintro-compat.js',
16171617
'src/core/headers/coincidenceheader.js',
16181618
'src/core/internal/dictionary.js',
16191619
'src/core/linq/observable/join.js', // SerialDisposable, SingleAssignmentDisposable, RefCountDisposable, CompositeDisposable, Dictionary
@@ -1684,7 +1684,7 @@ module.exports = function (grunt) {
16841684
'experimental-lite-compat': {
16851685
src: [
16861686
'src/core/headers/license.js',
1687-
'src/core/headers/litecompatintro.js',
1687+
'src/core/headers/liteintro-compat.js',
16881688
'src/core/headers/experimentalheader.js',
16891689
'src/core/headers/enumeratorheader.js',
16901690
'src/core/linq/enumerable/while.js', // Enumerable
@@ -1744,7 +1744,7 @@ module.exports = function (grunt) {
17441744
'joinpatterns-lite-compat': {
17451745
src: [
17461746
'src/core/headers/license.js',
1747-
'src/core/headers/litecompatintro.js',
1747+
'src/core/headers/liteintro-compat.js',
17481748
'src/core/headers/joinpatternsheader.js',
17491749
'src/core/internal/map.js',
17501750
'src/core/joins/pattern.js',
@@ -1797,7 +1797,7 @@ module.exports = function (grunt) {
17971797
'testing-lite-compat': {
17981798
src: [
17991799
'src/core/headers/license.js',
1800-
'src/core/headers/litetestintrocompat.js',
1800+
'src/core/headers/litetestintro-compat.js',
18011801
'src/core/headers/testheader.js',
18021802
'src/core/testing/reactivetest.js',
18031803
'src/core/testing/recorded.js',
@@ -1883,7 +1883,7 @@ module.exports = function (grunt) {
18831883
'time-lite-compat': {
18841884
src: [
18851885
'src/core/headers/license.js',
1886-
'src/core/headers/litecompatintro.js',
1886+
'src/core/headers/liteintro-compat.js',
18871887
'src/core/headers/timeheader.js',
18881888
'src/core/internal/trycatch.js',
18891889
'src/core/linq/observable/windowwithtime.js', // AnonymousObservable, SerialDisposable, SingleAssignmentDisposable, RefCountDisposable, CompositeDisposable, addref, subject
@@ -1933,7 +1933,7 @@ module.exports = function (grunt) {
19331933
'virtualtime-lite-compat': {
19341934
src: [
19351935
'src/core/headers/license.js',
1936-
'src/core/headers/litecompatintro.js',
1936+
'src/core/headers/liteintro-compat.js',
19371937
'src/core/headers/virtualtimeheader.js',
19381938
'src/core/concurrency/virtualtimescheduler.js',
19391939
'src/core/concurrency/historicalscheduler.js',

‎dist/rx.all.compat.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
// Defaults
3333
var noop = Rx.helpers.noop = function () { },
3434
notDefined = Rx.helpers.notDefined = function (x) { return typeof x === 'undefined'; },
35-
isScheduler = Rx.helpers.isScheduler = function (x) { return x instanceof Rx.Scheduler; },
3635
identity = Rx.helpers.identity = function (x) { return x; },
3736
pluck = Rx.helpers.pluck = function (property) { return function (x) { return x[property]; }; },
3837
just = Rx.helpers.just = function (value) { return function () { return value; }; },
@@ -1128,6 +1127,11 @@
11281127
this._scheduleAbsolute = scheduleAbsolute;
11291128
}
11301129

1130+
/** Determines whether the given object is a scheduler */
1131+
Scheduler.isScheduler = function (s) {
1132+
return s instanceof Scheduler;
1133+
}
1134+
11311135
function invokeAction(scheduler, action) {
11321136
action();
11331137
return disposableEmpty;
@@ -1212,7 +1216,7 @@
12121216
return Scheduler;
12131217
}());
12141218

1215-
var normalizeTime = Scheduler.normalize;
1219+
var normalizeTime = Scheduler.normalize, isScheduler = Scheduler.isScheduler;
12161220

12171221
(function (schedulerProto) {
12181222

@@ -1599,7 +1603,7 @@
15991603
/**
16001604
* Gets a scheduler that schedules work via a timed callback based upon platform.
16011605
*/
1602-
var timeoutScheduler = Scheduler.timeout = Scheduler.default = (function () {
1606+
var timeoutScheduler = Scheduler.timeout = Scheduler['default'] = (function () {
16031607

16041608
function scheduleNow(state, action) {
16051609
var scheduler = this, disposable = new SingleAssignmentDisposable();
@@ -9138,9 +9142,9 @@
91389142
*
91399143
* @example
91409144
* 1 - res = source.timestamp(); // produces { value: x, timestamp: ts }
9141-
* 2 - res = source.timestamp(Rx.Scheduler.timeout);
9145+
* 2 - res = source.timestamp(Rx.Scheduler.default);
91429146
*
9143-
* @param {Scheduler} [scheduler] Scheduler used to compute timestamps. If not specified, the timeout scheduler is used.
9147+
* @param {Scheduler} [scheduler] Scheduler used to compute timestamps. If not specified, the default scheduler is used.
91449148
* @returns {Observable} An observable sequence with timestamp information on values.
91459149
*/
91469150
observableProto.timestamp = function (scheduler) {

‎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 & 5 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: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
// Defaults
3333
var noop = Rx.helpers.noop = function () { },
3434
notDefined = Rx.helpers.notDefined = function (x) { return typeof x === 'undefined'; },
35-
isScheduler = Rx.helpers.isScheduler = function (x) { return x instanceof Rx.Scheduler; },
3635
identity = Rx.helpers.identity = function (x) { return x; },
3736
pluck = Rx.helpers.pluck = function (property) { return function (x) { return x[property]; }; },
3837
just = Rx.helpers.just = function (value) { return function () { return value; }; },
@@ -937,6 +936,11 @@
937936
this._scheduleAbsolute = scheduleAbsolute;
938937
}
939938

939+
/** Determines whether the given object is a scheduler */
940+
Scheduler.isScheduler = function (s) {
941+
return s instanceof Scheduler;
942+
}
943+
940944
function invokeAction(scheduler, action) {
941945
action();
942946
return disposableEmpty;
@@ -1021,7 +1025,7 @@
10211025
return Scheduler;
10221026
}());
10231027

1024-
var normalizeTime = Scheduler.normalize;
1028+
var normalizeTime = Scheduler.normalize, isScheduler = Scheduler.isScheduler;
10251029

10261030
(function (schedulerProto) {
10271031

@@ -1408,7 +1412,7 @@
14081412
/**
14091413
* Gets a scheduler that schedules work via a timed callback based upon platform.
14101414
*/
1411-
var timeoutScheduler = Scheduler.timeout = Scheduler.default = (function () {
1415+
var timeoutScheduler = Scheduler.timeout = Scheduler['default'] = (function () {
14121416

14131417
function scheduleNow(state, action) {
14141418
var scheduler = this, disposable = new SingleAssignmentDisposable();
@@ -8925,9 +8929,9 @@
89258929
*
89268930
* @example
89278931
* 1 - res = source.timestamp(); // produces { value: x, timestamp: ts }
8928-
* 2 - res = source.timestamp(Rx.Scheduler.timeout);
8932+
* 2 - res = source.timestamp(Rx.Scheduler.default);
89298933
*
8930-
* @param {Scheduler} [scheduler] Scheduler used to compute timestamps. If not specified, the timeout scheduler is used.
8934+
* @param {Scheduler} [scheduler] Scheduler used to compute timestamps. If not specified, the default scheduler is used.
89318935
* @returns {Observable} An observable sequence with timestamp information on values.
89328936
*/
89338937
observableProto.timestamp = function (scheduler) {

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

‎dist/rx.async.compat.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
disposableCreate = Rx.Disposable.create,
4444
CompositeDisposable = Rx.CompositeDisposable,
4545
immediateScheduler = Rx.Scheduler.immediate,
46-
timeoutScheduler = Rx.Scheduler.timeout,
47-
isScheduler = Rx.helpers.isScheduler,
46+
timeoutScheduler = Rx.Scheduler['default'],
47+
isScheduler = Rx.Scheduler.isScheduler,
4848
slice = Array.prototype.slice;
4949

5050
var fnString = 'function',

‎dist/rx.async.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.

0 commit comments

Comments
 (0)