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

Commit e4d7ad4

Browse files
Merge pull request #851 from xgrommx/master
Some updates
2 parents 1258b03 + 2c35b08 commit e4d7ad4

19 files changed

Lines changed: 100 additions & 30 deletions

dist/rx.all.compat.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6284,7 +6284,16 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
62846284
}, source);
62856285
};
62866286

6287-
var spawn = Observable.spawn = function () {
6287+
var wrap = Observable.wrap = function (fn) {
6288+
createObservable.__generatorFunction__ = fn;
6289+
return createObservable;
6290+
6291+
function createObservable() {
6292+
return Observable.spawn.call(this, fn.apply(this, arguments));
6293+
}
6294+
};
6295+
6296+
var spawn = Observable.spawn = function () {
62886297
var gen = arguments[0], self = this, args = [];
62896298
for (var i = 1, len = arguments.length; i < len; i++) { args.push(arguments[i]); }
62906299

@@ -6315,6 +6324,7 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
63156324
if (ret.done) {
63166325
o.onNext(ret.value);
63176326
o.onCompleted();
6327+
return;
63186328
}
63196329
var value = toObservable.call(self, ret.value);
63206330
if (Observable.isObservable(value)) {
@@ -6341,7 +6351,7 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
63416351

63426352
function arrayToObservable (obj) {
63436353
return Observable.from(obj)
6344-
.map(toObservable, this)
6354+
.flatMap(toObservable)
63456355
.toArray();
63466356
}
63476357

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: 3 additions & 3 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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6182,7 +6182,16 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
61826182
}, source);
61836183
};
61846184

6185-
var spawn = Observable.spawn = function () {
6185+
var wrap = Observable.wrap = function (fn) {
6186+
createObservable.__generatorFunction__ = fn;
6187+
return createObservable;
6188+
6189+
function createObservable() {
6190+
return Observable.spawn.call(this, fn.apply(this, arguments));
6191+
}
6192+
};
6193+
6194+
var spawn = Observable.spawn = function () {
61866195
var gen = arguments[0], self = this, args = [];
61876196
for (var i = 1, len = arguments.length; i < len; i++) { args.push(arguments[i]); }
61886197

@@ -6213,6 +6222,7 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
62136222
if (ret.done) {
62146223
o.onNext(ret.value);
62156224
o.onCompleted();
6225+
return;
62166226
}
62176227
var value = toObservable.call(self, ret.value);
62186228
if (Observable.isObservable(value)) {
@@ -6239,7 +6249,7 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
62396249

62406250
function arrayToObservable (obj) {
62416251
return Observable.from(obj)
6242-
.map(toObservable, this)
6252+
.flatMap(toObservable)
62436253
.toArray();
62446254
}
62456255

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: 3 additions & 3 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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,16 @@
6363
throw e;
6464
}
6565

66-
var spawn = Observable.spawn = function () {
66+
var wrap = Observable.wrap = function (fn) {
67+
createObservable.__generatorFunction__ = fn;
68+
return createObservable;
69+
70+
function createObservable() {
71+
return Observable.spawn.call(this, fn.apply(this, arguments));
72+
}
73+
};
74+
75+
var spawn = Observable.spawn = function () {
6776
var gen = arguments[0], self = this, args = [];
6877
for (var i = 1, len = arguments.length; i < len; i++) { args.push(arguments[i]); }
6978

@@ -94,6 +103,7 @@
94103
if (ret.done) {
95104
o.onNext(ret.value);
96105
o.onCompleted();
106+
return;
97107
}
98108
var value = toObservable.call(self, ret.value);
99109
if (Observable.isObservable(value)) {
@@ -120,7 +130,7 @@
120130

121131
function arrayToObservable (obj) {
122132
return Observable.from(obj)
123-
.map(toObservable, this)
133+
.flatMap(toObservable)
124134
.toArray();
125135
}
126136

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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,16 @@
6363
throw e;
6464
}
6565

66-
var spawn = Observable.spawn = function () {
66+
var wrap = Observable.wrap = function (fn) {
67+
createObservable.__generatorFunction__ = fn;
68+
return createObservable;
69+
70+
function createObservable() {
71+
return Observable.spawn.call(this, fn.apply(this, arguments));
72+
}
73+
};
74+
75+
var spawn = Observable.spawn = function () {
6776
var gen = arguments[0], self = this, args = [];
6877
for (var i = 1, len = arguments.length; i < len; i++) { args.push(arguments[i]); }
6978

@@ -94,6 +103,7 @@
94103
if (ret.done) {
95104
o.onNext(ret.value);
96105
o.onCompleted();
106+
return;
97107
}
98108
var value = toObservable.call(self, ret.value);
99109
if (Observable.isObservable(value)) {
@@ -120,7 +130,7 @@
120130

121131
function arrayToObservable (obj) {
122132
return Observable.from(obj)
123-
.map(toObservable, this)
133+
.flatMap(toObservable)
124134
.toArray();
125135
}
126136

0 commit comments

Comments
 (0)