Fixing spawn for Observables

Reactive-Extensions · Aug 3, 2015 · 73ae54d · 73ae54d
1 parent 0b66ec3
commit 73ae54d
Show file tree

Hide file tree

Showing 42 changed files with 111 additions and 65 deletions.
diff --git a/dist/rx.all.compat.js b/dist/rx.all.compat.js
@@ -2152,7 +2152,7 @@
     * @param {Any} An object to determine whether it is an Observable
     * @returns {Boolean} true if an Observable, else false.
     */
-    observableProto.isObservable = function (o) {
+    Observable.isObservable = function (o) {
       return o && isFunction(o.subscribe);
     }
 
@@ -6321,10 +6321,11 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
   function toObservable(obj) {
     if (!obj) { return obj; }
     if (Observable.isObservable(obj)) { return obj; }
-    if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
     if (isPromise(obj)) { return Observable.fromPromise(obj); }
     if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
     if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
+    if (isArrayLike(obj) || isIterable(obj)) { return arrayToObservable.call(this, obj); }
+    if (isObject(obj)) return objectToObservable.call(this, obj);
     return obj;
   }
 
@@ -6385,6 +6386,10 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
     return isGenerator(ctor.prototype);
   }
 
+  function isObject(val) {
+    return Object == val.constructor;
+  }
+
   /**
    * Invokes the specified function asynchronously on the specified scheduler, surfacing the result through an observable sequence.
    *

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
@@ -1961,7 +1961,7 @@
     * @param {Any} An object to determine whether it is an Observable
     * @returns {Boolean} true if an Observable, else false.
     */
-    observableProto.isObservable = function (o) {
+    Observable.isObservable = function (o) {
       return o && isFunction(o.subscribe);
     }
 
@@ -6219,10 +6219,11 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
   function toObservable(obj) {
     if (!obj) { return obj; }
     if (Observable.isObservable(obj)) { return obj; }
-    if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
     if (isPromise(obj)) { return Observable.fromPromise(obj); }
     if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
     if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
+    if (isArrayLike(obj) || isIterable(obj)) { return arrayToObservable.call(this, obj); }
+    if (isObject(obj)) return objectToObservable.call(this, obj);
     return obj;
   }
 
@@ -6283,6 +6284,10 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
     return isGenerator(ctor.prototype);
   }
 
+  function isObject(val) {
+    return Object == val.constructor;
+  }
+
   /**
    * Invokes the specified function asynchronously on the specified scheduler, surfacing the result through an observable sequence.
    *

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.async.compat.js b/dist/rx.async.compat.js
@@ -110,10 +110,11 @@
   function toObservable(obj) {
     if (!obj) { return obj; }
     if (Observable.isObservable(obj)) { return obj; }
-    if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
     if (isPromise(obj)) { return Observable.fromPromise(obj); }
     if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
     if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
+    if (isArrayLike(obj) || isIterable(obj)) { return arrayToObservable.call(this, obj); }
+    if (isObject(obj)) return objectToObservable.call(this, obj);
     return obj;
   }
 
@@ -174,6 +175,10 @@
     return isGenerator(ctor.prototype);
   }
 
+  function isObject(val) {
+    return Object == val.constructor;
+  }
+
   /**
    * Invokes the specified function asynchronously on the specified scheduler, surfacing the result through an observable sequence.
    *

diff --git a/dist/rx.async.compat.map b/dist/rx.async.compat.map
diff --git a/dist/rx.async.compat.min.js b/dist/rx.async.compat.min.js
diff --git a/dist/rx.async.js b/dist/rx.async.js
@@ -110,10 +110,11 @@
   function toObservable(obj) {
     if (!obj) { return obj; }
     if (Observable.isObservable(obj)) { return obj; }
-    if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
     if (isPromise(obj)) { return Observable.fromPromise(obj); }
     if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
     if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
+    if (isArrayLike(obj) || isIterable(obj)) { return arrayToObservable.call(this, obj); }
+    if (isObject(obj)) return objectToObservable.call(this, obj);
     return obj;
   }
 
@@ -174,6 +175,10 @@
     return isGenerator(ctor.prototype);
   }
 
+  function isObject(val) {
+    return Object == val.constructor;
+  }
+
   /**
    * Invokes the specified function asynchronously on the specified scheduler, surfacing the result through an observable sequence.
    *