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

Commit a1f10de

Browse files
Fixing timeout with Issue #969
1 parent 72ec8cf commit a1f10de

File tree

48 files changed

+65
-65
lines changed

Some content is hidden

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

48 files changed

+65
-65
lines changed

dist/rx.all.compat.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10385,7 +10385,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1038510385
timeoutDurationSelector = firstTimeout;
1038610386
firstTimeout = observableNever();
1038710387
}
10388-
other || (other = observableThrow(new TimeoutError()));
10388+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
1038910389
return new AnonymousObservable(function (o) {
1039010390
var subscription = new SerialDisposable(),
1039110391
timer = new SerialDisposable(),
@@ -10445,7 +10445,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1044510445
}
1044610446
if (other instanceof Error) { other = observableThrow(other); }
1044710447
isScheduler(scheduler) || (scheduler = defaultScheduler);
10448-
10448+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
1044910449
return new AnonymousObservable(function (o) {
1045010450
var id = 0,
1045110451
original = new SingleAssignmentDisposable(),

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: 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.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10130,7 +10130,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1013010130
timeoutDurationSelector = firstTimeout;
1013110131
firstTimeout = observableNever();
1013210132
}
10133-
other || (other = observableThrow(new TimeoutError()));
10133+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
1013410134
return new AnonymousObservable(function (o) {
1013510135
var subscription = new SerialDisposable(),
1013610136
timer = new SerialDisposable(),
@@ -10190,7 +10190,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
1019010190
}
1019110191
if (other instanceof Error) { other = observableThrow(other); }
1019210192
isScheduler(scheduler) || (scheduler = defaultScheduler);
10193-
10193+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
1019410194
return new AnonymousObservable(function (o) {
1019510195
var id = 0,
1019610196
original = new SingleAssignmentDisposable(),

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.lite.compat.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6136,7 +6136,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
61366136
timeoutDurationSelector = firstTimeout;
61376137
firstTimeout = observableNever();
61386138
}
6139-
other || (other = observableThrow(new TimeoutError()));
6139+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
61406140
return new AnonymousObservable(function (o) {
61416141
var subscription = new SerialDisposable(),
61426142
timer = new SerialDisposable(),
@@ -6196,7 +6196,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
61966196
}
61976197
if (other instanceof Error) { other = observableThrow(other); }
61986198
isScheduler(scheduler) || (scheduler = defaultScheduler);
6199-
6199+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
62006200
return new AnonymousObservable(function (o) {
62016201
var id = 0,
62026202
original = new SingleAssignmentDisposable(),

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

dist/rx.lite.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5794,7 +5794,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
57945794
timeoutDurationSelector = firstTimeout;
57955795
firstTimeout = observableNever();
57965796
}
5797-
other || (other = observableThrow(new TimeoutError()));
5797+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
57985798
return new AnonymousObservable(function (o) {
57995799
var subscription = new SerialDisposable(),
58005800
timer = new SerialDisposable(),
@@ -5854,7 +5854,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
58545854
}
58555855
if (other instanceof Error) { other = observableThrow(other); }
58565856
isScheduler(scheduler) || (scheduler = defaultScheduler);
5857-
5857+
Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
58585858
return new AnonymousObservable(function (o) {
58595859
var id = 0,
58605860
original = new SingleAssignmentDisposable(),

0 commit comments

Comments
 (0)