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

Commit 013b560

Browse files
mattpodwysockimattpodwysocki
committed
Fixing build
1 parent 15a5e6c commit 013b560

19 files changed

+206
-20
lines changed

‎dist/rx.all.compat.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6321,11 +6321,42 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
63216321
function toObservable(obj) {
63226322
if (!obj) { return obj; }
63236323
if (Observable.isObservable(obj)) { return obj; }
6324+
if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
6325+
if (isPromise(obj)) { return Observable.fromPromise(obj); }
63246326
if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
63256327
if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
63266328
return obj;
63276329
}
63286330

6331+
function arrayToObservable (obj) {
6332+
return Observable.from(obj)
6333+
.map(toObservable, this)
6334+
.toArray();
6335+
}
6336+
6337+
function objectToObservable (obj) {
6338+
var results = new obj.constructor(), keys = Object.keys(obj), observables = [];
6339+
for (var i = 0, len = keys.length; i < len; i++) {
6340+
var key = keys[i], observable = toObservable.call(this, obj[key]);
6341+
if (observable && Observable.isObservable(observable)) {
6342+
defer(observable, key);
6343+
} else {
6344+
results[key] = obj[key];
6345+
}
6346+
}
6347+
return Observable.concat(observables).startWith(results);
6348+
6349+
function defer (observable, key) {
6350+
results[key] = undefined;
6351+
observables.push(new AnonymousObservable(function (o) {
6352+
return observable.subscribe(function (next) {
6353+
results[key] = next;
6354+
o.onCompleted();
6355+
});
6356+
}));
6357+
}
6358+
}
6359+
63296360
function thunkToObservable(fn) {
63306361
var self = this;
63316362
return new AnonymousObservable(function (o) {

‎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 & 4 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: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6219,11 +6219,42 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
62196219
function toObservable(obj) {
62206220
if (!obj) { return obj; }
62216221
if (Observable.isObservable(obj)) { return obj; }
6222+
if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
6223+
if (isPromise(obj)) { return Observable.fromPromise(obj); }
62226224
if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
62236225
if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
62246226
return obj;
62256227
}
62266228

6229+
function arrayToObservable (obj) {
6230+
return Observable.from(obj)
6231+
.map(toObservable, this)
6232+
.toArray();
6233+
}
6234+
6235+
function objectToObservable (obj) {
6236+
var results = new obj.constructor(), keys = Object.keys(obj), observables = [];
6237+
for (var i = 0, len = keys.length; i < len; i++) {
6238+
var key = keys[i], observable = toObservable.call(this, obj[key]);
6239+
if (observable && Observable.isObservable(observable)) {
6240+
defer(observable, key);
6241+
} else {
6242+
results[key] = obj[key];
6243+
}
6244+
}
6245+
return Observable.concat(observables).startWith(results);
6246+
6247+
function defer (observable, key) {
6248+
results[key] = undefined;
6249+
observables.push(new AnonymousObservable(function (o) {
6250+
return observable.subscribe(function (next) {
6251+
results[key] = next;
6252+
o.onCompleted();
6253+
});
6254+
}));
6255+
}
6256+
}
6257+
62276258
function thunkToObservable(fn) {
62286259
var self = this;
62296260
return new AnonymousObservable(function (o) {

‎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: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,42 @@
110110
function toObservable(obj) {
111111
if (!obj) { return obj; }
112112
if (Observable.isObservable(obj)) { return obj; }
113+
if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
114+
if (isPromise(obj)) { return Observable.fromPromise(obj); }
113115
if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
114116
if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
115117
return obj;
116118
}
117119

120+
function arrayToObservable (obj) {
121+
return Observable.from(obj)
122+
.map(toObservable, this)
123+
.toArray();
124+
}
125+
126+
function objectToObservable (obj) {
127+
var results = new obj.constructor(), keys = Object.keys(obj), observables = [];
128+
for (var i = 0, len = keys.length; i < len; i++) {
129+
var key = keys[i], observable = toObservable.call(this, obj[key]);
130+
if (observable && Observable.isObservable(observable)) {
131+
defer(observable, key);
132+
} else {
133+
results[key] = obj[key];
134+
}
135+
}
136+
return Observable.concat(observables).startWith(results);
137+
138+
function defer (observable, key) {
139+
results[key] = undefined;
140+
observables.push(new AnonymousObservable(function (o) {
141+
return observable.subscribe(function (next) {
142+
results[key] = next;
143+
o.onCompleted();
144+
});
145+
}));
146+
}
147+
}
148+
118149
function thunkToObservable(fn) {
119150
var self = this;
120151
return new AnonymousObservable(function (o) {

‎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.

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,42 @@
110110
function toObservable(obj) {
111111
if (!obj) { return obj; }
112112
if (Observable.isObservable(obj)) { return obj; }
113+
if (isArrayLike(result) || isIterable(result)) { return arrayToObservable.call(this, obj); }
114+
if (isPromise(obj)) { return Observable.fromPromise(obj); }
113115
if (isGeneratorFunction(obj) || isGenerator(obj)) { return spawn.call(this, obj); }
114116
if (isFunction(obj)) { return thunkToObservable.call(this, obj); }
115117
return obj;
116118
}
117119

120+
function arrayToObservable (obj) {
121+
return Observable.from(obj)
122+
.map(toObservable, this)
123+
.toArray();
124+
}
125+
126+
function objectToObservable (obj) {
127+
var results = new obj.constructor(), keys = Object.keys(obj), observables = [];
128+
for (var i = 0, len = keys.length; i < len; i++) {
129+
var key = keys[i], observable = toObservable.call(this, obj[key]);
130+
if (observable && Observable.isObservable(observable)) {
131+
defer(observable, key);
132+
} else {
133+
results[key] = obj[key];
134+
}
135+
}
136+
return Observable.concat(observables).startWith(results);
137+
138+
function defer (observable, key) {
139+
results[key] = undefined;
140+
observables.push(new AnonymousObservable(function (o) {
141+
return observable.subscribe(function (next) {
142+
results[key] = next;
143+
o.onCompleted();
144+
});
145+
}));
146+
}
147+
}
148+
118149
function thunkToObservable(fn) {
119150
var self = this;
120151
return new AnonymousObservable(function (o) {

0 commit comments

Comments
 (0)