Fixing timeout with Issue #969

mattpodwysocki · mattpodwysocki · commit a1f10de40007 · 2015-10-13T19:26:53.000-04:00
diff --git a/dist/rx.all.compat.js b/dist/rx.all.compat.js
@@ -10385,7 +10385,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -10445,7 +10445,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/dist/rx.all.compat.map b/dist/rx.all.compat.map
diff --git a/dist/rx.all.compat.min.js b/dist/rx.all.compat.min.js
diff --git a/dist/rx.all.js b/dist/rx.all.js
@@ -10130,7 +10130,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -10190,7 +10190,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/dist/rx.all.map b/dist/rx.all.map
diff --git a/dist/rx.all.min.js b/dist/rx.all.min.js
diff --git a/dist/rx.lite.compat.js b/dist/rx.lite.compat.js
@@ -6136,7 +6136,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -6196,7 +6196,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/dist/rx.lite.compat.map b/dist/rx.lite.compat.map
diff --git a/dist/rx.lite.compat.min.js b/dist/rx.lite.compat.min.js
diff --git a/dist/rx.lite.js b/dist/rx.lite.js
@@ -5794,7 +5794,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -5854,7 +5854,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/dist/rx.lite.map b/dist/rx.lite.map
diff --git a/dist/rx.lite.min.js b/dist/rx.lite.min.js
diff --git a/dist/rx.time.js b/dist/rx.time.js
@@ -774,7 +774,7 @@
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -834,7 +834,7 @@
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/dist/rx.time.map b/dist/rx.time.map
diff --git a/dist/rx.time.min.js b/dist/rx.time.min.js
diff --git a/modules/rx-core-binding/package.json b/modules/rx-core-binding/package.json
@@ -2,7 +2,7 @@
   "name": "rx-core-binding",
   "title": "Reactive Extensions for JavaScript (RxJS) Core",
   "description": "Core binding library for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-core-testing/package.json b/modules/rx-core-testing/package.json
@@ -2,7 +2,7 @@
   "name": "rx-core-testing",
   "title": "Reactive Extensions for JavaScript (RxJS) Core",
   "description": "Core testing library for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-core/package.json b/modules/rx-core/package.json
@@ -2,7 +2,7 @@
   "name": "rx-core",
   "title": "Reactive Extensions for JavaScript (RxJS) Core",
   "description": "Core library for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-aggregates-compat/package.json b/modules/rx-lite-aggregates-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-aggregates-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Aggregates",
   "description": "Lightweight older browser compatible library with aggregate functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-aggregates/package.json b/modules/rx-lite-aggregates/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-aggregates",
   "title": "Reactive Extensions for JavaScript (RxJS) Aggregates",
   "description": "Lightweight library with aggregate functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-async-compat/package.json b/modules/rx-lite-async-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-async-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with asynchronous functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-async/package.json b/modules/rx-lite-async/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-async",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with asynchronous functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-backpressure-compat/package.json b/modules/rx-lite-backpressure-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-backpressure-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with backpressure functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-backpressure/package.json b/modules/rx-lite-backpressure/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-backpressure",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with backpressure functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-coincidence-compat/package.json b/modules/rx-lite-coincidence-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-coincidence-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with coincidence functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-coincidence/package.json b/modules/rx-lite-coincidence/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-coincidence",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with coincidence functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-compat/package.json b/modules/rx-lite-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Lite",
   "description": "Lightweight IE6 compatible library for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-compat/rx.lite.compat.js b/modules/rx-lite-compat/rx.lite.compat.js
@@ -6136,7 +6136,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -6196,7 +6196,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/modules/rx-lite-compat/rx.lite.compat.map b/modules/rx-lite-compat/rx.lite.compat.map
diff --git a/modules/rx-lite-compat/rx.lite.compat.min.js b/modules/rx-lite-compat/rx.lite.compat.min.js
diff --git a/modules/rx-lite-experimental-compat/package.json b/modules/rx-lite-experimental-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-experimental-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with experimental functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-experimental/package.json b/modules/rx-lite-experimental/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-experimental",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with experimental functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-extras-compat/package.json b/modules/rx-lite-extras-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-extras-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Lite",
   "description": "Lightweight IE6 compatible library extras for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-extras/package.json b/modules/rx-lite-extras/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-extras",
   "title": "Reactive Extensions for JavaScript (RxJS) Lite",
   "description": "Lightweight library extras for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-joinpatterns-compat/package.json b/modules/rx-lite-joinpatterns-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-joinpatterns-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with join pattern functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-joinpatterns/package.json b/modules/rx-lite-joinpatterns/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-joinpatterns",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with join pattern functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-testing-compat/package.json b/modules/rx-lite-testing-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-testing-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with testing functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-testing/package.json b/modules/rx-lite-testing/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-testing",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with testing functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-time-compat/package.json b/modules/rx-lite-time-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-time-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with time-based functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-time/package.json b/modules/rx-lite-time/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-time",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with time-based functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-virtualtime-compat/package.json b/modules/rx-lite-virtualtime-compat/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-virtualtime-compat",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight older browser compatible library with virtual time functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite-virtualtime/package.json b/modules/rx-lite-virtualtime/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite-virtualtime",
   "title": "Reactive Extensions for JavaScript (RxJS) Async",
   "description": "Lightweight library with virtual time functions for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite/package.json b/modules/rx-lite/package.json
@@ -2,7 +2,7 @@
   "name": "rx-lite",
   "title": "Reactive Extensions for JavaScript (RxJS) Lite",
   "description": "Lightweight library for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/modules/rx-lite/rx.lite.js b/modules/rx-lite/rx.lite.js
@@ -5794,7 +5794,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -5854,7 +5854,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
diff --git a/modules/rx-lite/rx.lite.map b/modules/rx-lite/rx.lite.map
diff --git a/modules/rx-lite/rx.lite.min.js b/modules/rx-lite/rx.lite.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "rx",
   "title": "Reactive Extensions for JavaScript (RxJS)",
   "description": "Library for composing asynchronous and event-based operations in JavaScript",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "homepage": "https://github.com/Reactive-Extensions/RxJS",
   "author": {
     "name": "Cloud Programmability Team",
diff --git a/src/core/linq/observable/timeout.js b/src/core/linq/observable/timeout.js
@@ -11,7 +11,7 @@
       timeoutDurationSelector = firstTimeout;
       firstTimeout = observableNever();
     }
-    other || (other = observableThrow(new TimeoutError()));
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var subscription = new SerialDisposable(),
         timer = new SerialDisposable(),
@@ -71,7 +71,7 @@
     }
     if (other instanceof Error) { other = observableThrow(other); }
     isScheduler(scheduler) || (scheduler = defaultScheduler);
-
+    Observable.isObservable(other) || (other = observableThrow(new TimeoutError()));
     return new AnonymousObservable(function (o) {
       var id = 0,
         original = new SingleAssignmentDisposable(),
