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

Commit 4dd20e1

Browse files
mattpodwysockimattpodwysocki
committed
Fixing fromPromise
1 parent c3c817c commit 4dd20e1

40 files changed

Lines changed: 372 additions & 83 deletions

‎dist/rx.all.compat.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,9 +2771,17 @@ var ObserveOnObservable = (function (__super__) {
27712771
}
27722772

27732773
FromPromiseObservable.prototype.subscribeCore = function(o) {
2774-
var sad = new SingleAssignmentDisposable(), self = this;
2774+
var sad = new SingleAssignmentDisposable(), self = this, p = this._p;
27752775

2776-
this._p
2776+
if (isFunction(p)) {
2777+
p = tryCatch(p)();
2778+
if (p === errorObj) {
2779+
o.onError(p.e);
2780+
return sad;
2781+
}
2782+
}
2783+
2784+
p
27772785
.then(function (data) {
27782786
sad.setDisposable(self._s.schedule([o, data], scheduleNext));
27792787
}, function (err) {

‎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: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2420,9 +2420,17 @@ var ObserveOnObservable = (function (__super__) {
24202420
}
24212421

24222422
FromPromiseObservable.prototype.subscribeCore = function(o) {
2423-
var sad = new SingleAssignmentDisposable(), self = this;
2423+
var sad = new SingleAssignmentDisposable(), self = this, p = this._p;
24242424

2425-
this._p
2425+
if (isFunction(p)) {
2426+
p = tryCatch(p)();
2427+
if (p === errorObj) {
2428+
o.onError(p.e);
2429+
return sad;
2430+
}
2431+
}
2432+
2433+
p
24262434
.then(function (data) {
24272435
sad.setDisposable(self._s.schedule([o, data], scheduleNext));
24282436
}, function (err) {

‎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: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,9 +2771,17 @@ var ObserveOnObservable = (function (__super__) {
27712771
}
27722772

27732773
FromPromiseObservable.prototype.subscribeCore = function(o) {
2774-
var sad = new SingleAssignmentDisposable(), self = this;
2774+
var sad = new SingleAssignmentDisposable(), self = this, p = this._p;
27752775

2776-
this._p
2776+
if (isFunction(p)) {
2777+
p = tryCatch(p)();
2778+
if (p === errorObj) {
2779+
o.onError(p.e);
2780+
return sad;
2781+
}
2782+
}
2783+
2784+
p
27772785
.then(function (data) {
27782786
sad.setDisposable(self._s.schedule([o, data], scheduleNext));
27792787
}, function (err) {

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

0 commit comments

Comments
 (0)