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

Commit 7aa7716

Browse files
mattpodwysockimattpodwysocki
committed
Fixing build
1 parent 90976cf commit 7aa7716

File tree

13 files changed

+96
-34
lines changed

13 files changed

+96
-34
lines changed

‎rx.compat.js‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,9 +1692,13 @@
16921692
return;
16931693
}
16941694

1695+
// Check if promise
1696+
var currentValue = currentItem.value;
1697+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1698+
16951699
var d = new SingleAssignmentDisposable();
16961700
subscription.setDisposable(d);
1697-
d.setDisposable(currentItem.value.subscribe(
1701+
d.setDisposable(currentValue.subscribe(
16981702
observer.onNext.bind(observer),
16991703
observer.onError.bind(observer),
17001704
function () { self(); })
@@ -1741,9 +1745,13 @@
17411745
return;
17421746
}
17431747

1748+
// Check if promise
1749+
var currentValue = currentItem.value;
1750+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1751+
17441752
var d = new SingleAssignmentDisposable();
17451753
subscription.setDisposable(d);
1746-
d.setDisposable(currentItem.value.subscribe(
1754+
d.setDisposable(currentValue.subscribe(
17471755
observer.onNext.bind(observer),
17481756
function (exn) {
17491757
lastException = exn;
@@ -2262,6 +2270,12 @@
22622270
function (reason) {
22632271
observer.onError(reason);
22642272
});
2273+
2274+
return function () {
2275+
if (promise && promise.abort) {
2276+
promise.abort();
2277+
}
2278+
}
22652279
});
22662280
};
22672281
/*
@@ -2327,6 +2341,9 @@
23272341
} catch (e) {
23282342
return observableThrow(e).subscribe(observer);
23292343
}
2344+
2345+
// Check if promise
2346+
isPromise(result) && (result = observableFromPromise(result));
23302347
return result.subscribe(observer);
23312348
});
23322349
};

‎rx.compat.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rx.joinpatterns.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,12 @@
4242
SingleAssignmentDisposable = Rx.SingleAssignmentDisposable,
4343
CompositeDisposable = Rx.CompositeDisposable,
4444
AbstractObserver = Rx.internals.AbstractObserver,
45-
isEqual = Rx.internals.isEqual;
46-
47-
// Defaults
48-
function defaultComparer(x, y) { return isEqual(x, y); }
49-
function noop() { }
45+
noop = Rx.helpers.noop,
46+
defaultComparer = Rx.internals.isEqual,
47+
inherits = Rx.internals.inherits,
48+
slice = Array.prototype.slice;
5049

5150
// Utilities
52-
var inherits = Rx.internals.inherits;
53-
var slice = Array.prototype.slice;
5451
function argsOrArray(args, idx) {
5552
return args.length === 1 && Array.isArray(args[idx]) ?
5653
args[idx] :

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

‎rx.js‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,9 +1574,13 @@
15741574
return;
15751575
}
15761576

1577+
// Check if promise
1578+
var currentValue = currentItem.value;
1579+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1580+
15771581
var d = new SingleAssignmentDisposable();
15781582
subscription.setDisposable(d);
1579-
d.setDisposable(currentItem.value.subscribe(
1583+
d.setDisposable(currentValue.subscribe(
15801584
observer.onNext.bind(observer),
15811585
observer.onError.bind(observer),
15821586
function () { self(); })
@@ -1623,9 +1627,13 @@
16231627
return;
16241628
}
16251629

1630+
// Check if promise
1631+
var currentValue = currentItem.value;
1632+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1633+
16261634
var d = new SingleAssignmentDisposable();
16271635
subscription.setDisposable(d);
1628-
d.setDisposable(currentItem.value.subscribe(
1636+
d.setDisposable(currentValue.subscribe(
16291637
observer.onNext.bind(observer),
16301638
function (exn) {
16311639
lastException = exn;
@@ -2144,6 +2152,12 @@
21442152
function (reason) {
21452153
observer.onError(reason);
21462154
});
2155+
2156+
return function () {
2157+
if (promise && promise.abort) {
2158+
promise.abort();
2159+
}
2160+
}
21472161
});
21482162
};
21492163
/*
@@ -2209,6 +2223,9 @@
22092223
} catch (e) {
22102224
return observableThrow(e).subscribe(observer);
22112225
}
2226+
2227+
// Check if promise
2228+
isPromise(result) && (result = observableFromPromise(result));
22122229
return result.subscribe(observer);
22132230
});
22142231
};

‎rx.lite.compat.js‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,9 +1581,13 @@
15811581
return;
15821582
}
15831583

1584+
// Check if promise
1585+
var currentValue = currentItem.value;
1586+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1587+
15841588
var d = new SingleAssignmentDisposable();
15851589
subscription.setDisposable(d);
1586-
d.setDisposable(currentItem.value.subscribe(
1590+
d.setDisposable(currentValue.subscribe(
15871591
observer.onNext.bind(observer),
15881592
observer.onError.bind(observer),
15891593
function () { self(); })
@@ -1630,9 +1634,13 @@
16301634
return;
16311635
}
16321636

1637+
// Check if promise
1638+
var currentValue = currentItem.value;
1639+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1640+
16331641
var d = new SingleAssignmentDisposable();
16341642
subscription.setDisposable(d);
1635-
d.setDisposable(currentItem.value.subscribe(
1643+
d.setDisposable(currentValue.subscribe(
16361644
observer.onNext.bind(observer),
16371645
function (exn) {
16381646
lastException = exn;
@@ -2029,6 +2037,9 @@
20292037
} catch (e) {
20302038
return observableThrow(e).subscribe(observer);
20312039
}
2040+
2041+
// Check if promise
2042+
isPromise(result) && (result = observableFromPromise(result));
20322043
return result.subscribe(observer);
20332044
});
20342045
};
@@ -3614,6 +3625,12 @@
36143625
function (reason) {
36153626
observer.onError(reason);
36163627
});
3628+
3629+
return function () {
3630+
if (promise && promise.abort) {
3631+
promise.abort();
3632+
}
3633+
}
36173634
});
36183635
};
36193636
/*

‎rx.lite.compat.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rx.lite.js‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,9 +1463,13 @@
14631463
return;
14641464
}
14651465

1466+
// Check if promise
1467+
var currentValue = currentItem.value;
1468+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1469+
14661470
var d = new SingleAssignmentDisposable();
14671471
subscription.setDisposable(d);
1468-
d.setDisposable(currentItem.value.subscribe(
1472+
d.setDisposable(currentValue.subscribe(
14691473
observer.onNext.bind(observer),
14701474
observer.onError.bind(observer),
14711475
function () { self(); })
@@ -1512,9 +1516,13 @@
15121516
return;
15131517
}
15141518

1519+
// Check if promise
1520+
var currentValue = currentItem.value;
1521+
isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
1522+
15151523
var d = new SingleAssignmentDisposable();
15161524
subscription.setDisposable(d);
1517-
d.setDisposable(currentItem.value.subscribe(
1525+
d.setDisposable(currentValue.subscribe(
15181526
observer.onNext.bind(observer),
15191527
function (exn) {
15201528
lastException = exn;
@@ -1911,6 +1919,9 @@
19111919
} catch (e) {
19121920
return observableThrow(e).subscribe(observer);
19131921
}
1922+
1923+
// Check if promise
1924+
isPromise(result) && (result = observableFromPromise(result));
19141925
return result.subscribe(observer);
19151926
});
19161927
};
@@ -3426,6 +3437,12 @@
34263437
function (reason) {
34273438
observer.onError(reason);
34283439
});
3440+
3441+
return function () {
3442+
if (promise && promise.abort) {
3443+
promise.abort();
3444+
}
3445+
}
34293446
});
34303447
};
34313448
/*

‎rx.lite.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rx.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)