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

Commit 34967af

Browse files
mattpodwysockimattpodwysocki
committed
Rebuild
1 parent df6f1df commit 34967af

42 files changed

Lines changed: 176 additions & 170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dist/rx.all.compat.js‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,20 +1670,14 @@
16701670
} else if (postMessageSupported()) {
16711671
var MSG_PREFIX = 'ms.rx.schedule' + Math.random();
16721672

1673-
function onGlobalPostMessage(event) {
1673+
var onGlobalPostMessage = function (event) {
16741674
// Only if we're a match to avoid any other global events
16751675
if (typeof event.data === 'string' && event.data.substring(0, MSG_PREFIX.length) === MSG_PREFIX) {
16761676
runTask(event.data.substring(MSG_PREFIX.length));
16771677
}
1678-
}
1678+
};
16791679

1680-
if (root.addEventListener) {
1681-
root.addEventListener('message', onGlobalPostMessage, false);
1682-
} else if (root.attachEvent) {
1683-
root.attachEvent('onmessage', onGlobalPostMessage);
1684-
} else {
1685-
root.onmessage = onGlobalPostMessage;
1686-
}
1680+
root.addEventListener('message', onGlobalPostMessage, false);
16871681

16881682
scheduleMethod = function (action) {
16891683
var id = nextHandle++;
@@ -7403,9 +7397,16 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
74037397
o.onCompleted();
74047398
return;
74057399
}
7406-
var value = toObservable.call(self, ret.value);
7407-
if (Observable.isObservable(value)) {
7408-
g.add(value.subscribe(processGenerator, onError));
7400+
var obs = toObservable.call(self, ret.value);
7401+
var value = null;
7402+
var hasValue = false;
7403+
if (Observable.isObservable(obs)) {
7404+
g.add(value.subscribe(function(val) {
7405+
hasValue = true;
7406+
value = val;
7407+
}, onError, function() {
7408+
hasValue && processGenerator(value);
7409+
}));
74097410
} else {
74107411
onError(new TypeError('type not supported'));
74117412
}
@@ -7427,9 +7428,13 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
74277428
}
74287429

74297430
function arrayToObservable (obj) {
7430-
return Observable.from(obj)
7431-
.flatMap(toObservable)
7432-
.toArray();
7431+
return Observable.from(obj).concatMap(function(o) {
7432+
if(Observable.isObservable(o) || isObject(o)) {
7433+
return toObservable.call(null, o);
7434+
} else {
7435+
return Rx.Observable.just(o);
7436+
}
7437+
}).toArray();
74337438
}
74347439

74357440
function objectToObservable (obj) {

‎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: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,20 +1302,14 @@
13021302
} else if (postMessageSupported()) {
13031303
var MSG_PREFIX = 'ms.rx.schedule' + Math.random();
13041304

1305-
function onGlobalPostMessage(event) {
1305+
var onGlobalPostMessage = function (event) {
13061306
// Only if we're a match to avoid any other global events
13071307
if (typeof event.data === 'string' && event.data.substring(0, MSG_PREFIX.length) === MSG_PREFIX) {
13081308
runTask(event.data.substring(MSG_PREFIX.length));
13091309
}
1310-
}
1310+
};
13111311

1312-
if (root.addEventListener) {
1313-
root.addEventListener('message', onGlobalPostMessage, false);
1314-
} else if (root.attachEvent) {
1315-
root.attachEvent('onmessage', onGlobalPostMessage);
1316-
} else {
1317-
root.onmessage = onGlobalPostMessage;
1318-
}
1312+
root.addEventListener('message', onGlobalPostMessage, false);
13191313

13201314
scheduleMethod = function (action) {
13211315
var id = nextHandle++;
@@ -7124,9 +7118,16 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
71247118
o.onCompleted();
71257119
return;
71267120
}
7127-
var value = toObservable.call(self, ret.value);
7128-
if (Observable.isObservable(value)) {
7129-
g.add(value.subscribe(processGenerator, onError));
7121+
var obs = toObservable.call(self, ret.value);
7122+
var value = null;
7123+
var hasValue = false;
7124+
if (Observable.isObservable(obs)) {
7125+
g.add(value.subscribe(function(val) {
7126+
hasValue = true;
7127+
value = val;
7128+
}, onError, function() {
7129+
hasValue && processGenerator(value);
7130+
}));
71307131
} else {
71317132
onError(new TypeError('type not supported'));
71327133
}
@@ -7148,9 +7149,13 @@ Rx.Observable.prototype.flatMapLatest = function(selector, resultSelector, thisA
71487149
}
71497150

71507151
function arrayToObservable (obj) {
7151-
return Observable.from(obj)
7152-
.flatMap(toObservable)
7153-
.toArray();
7152+
return Observable.from(obj).concatMap(function(o) {
7153+
if(Observable.isObservable(o) || isObject(o)) {
7154+
return toObservable.call(null, o);
7155+
} else {
7156+
return Rx.Observable.just(o);
7157+
}
7158+
}).toArray();
71547159
}
71557160

71567161
function objectToObservable (obj) {

‎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: 2 additions & 2 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: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,16 @@
114114
o.onCompleted();
115115
return;
116116
}
117-
var value = toObservable.call(self, ret.value);
118-
if (Observable.isObservable(value)) {
119-
g.add(value.subscribe(processGenerator, onError));
117+
var obs = toObservable.call(self, ret.value);
118+
var value = null;
119+
var hasValue = false;
120+
if (Observable.isObservable(obs)) {
121+
g.add(value.subscribe(function(val) {
122+
hasValue = true;
123+
value = val;
124+
}, onError, function() {
125+
hasValue && processGenerator(value);
126+
}));
120127
} else {
121128
onError(new TypeError('type not supported'));
122129
}
@@ -138,9 +145,13 @@
138145
}
139146

140147
function arrayToObservable (obj) {
141-
return Observable.from(obj)
142-
.flatMap(toObservable)
143-
.toArray();
148+
return Observable.from(obj).concatMap(function(o) {
149+
if(Observable.isObservable(o) || isObject(o)) {
150+
return toObservable.call(null, o);
151+
} else {
152+
return Rx.Observable.just(o);
153+
}
154+
}).toArray();
144155
}
145156

146157
function objectToObservable (obj) {

‎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: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,16 @@
114114
o.onCompleted();
115115
return;
116116
}
117-
var value = toObservable.call(self, ret.value);
118-
if (Observable.isObservable(value)) {
119-
g.add(value.subscribe(processGenerator, onError));
117+
var obs = toObservable.call(self, ret.value);
118+
var value = null;
119+
var hasValue = false;
120+
if (Observable.isObservable(obs)) {
121+
g.add(value.subscribe(function(val) {
122+
hasValue = true;
123+
value = val;
124+
}, onError, function() {
125+
hasValue && processGenerator(value);
126+
}));
120127
} else {
121128
onError(new TypeError('type not supported'));
122129
}
@@ -138,9 +145,13 @@
138145
}
139146

140147
function arrayToObservable (obj) {
141-
return Observable.from(obj)
142-
.flatMap(toObservable)
143-
.toArray();
148+
return Observable.from(obj).concatMap(function(o) {
149+
if(Observable.isObservable(o) || isObject(o)) {
150+
return toObservable.call(null, o);
151+
} else {
152+
return Rx.Observable.just(o);
153+
}
154+
}).toArray();
144155
}
145156

146157
function objectToObservable (obj) {

0 commit comments

Comments
 (0)