Skip to content

Commit

Permalink
chore(package): release new version
Browse files Browse the repository at this point in the history
  • Loading branch information
staltz committed Jul 20, 2016
1 parent 5327cb0 commit 5829bf9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 10 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="5.2.3"></a>
## [5.2.3](https://github.com/staltz/xstream/compare/v5.2.2...v5.2.3) (2016-07-20)


### Bug Fixes

* **merge:** support union types ([5327cb0](https://github.com/staltz/xstream/commit/5327cb0)), closes [staltz/xstream#80](https://github.com/staltz/xstream/issues/80)



<a name="5.2.2"></a>
## [5.2.2](https://github.com/staltz/xstream/compare/v5.2.1...v5.2.2) (2016-07-19)

Expand Down
16 changes: 8 additions & 8 deletions dist/xstream.js
Original file line number Diff line number Diff line change
Expand Up @@ -1047,14 +1047,6 @@ var Stream = (function () {
Stream.periodic = function (period) {
return new Stream(new PeriodicProducer(period));
};

Stream.merge = function () {
var streams = [];
for (var _i = 0; _i < arguments.length; _i++) {
streams[_i - 0] = arguments[_i];
}
return new Stream(new MergeProducer(streams));
};
Stream.prototype._map = function (project) {
var p = this._prod;
var ctor = this.ctor();
Expand Down Expand Up @@ -1161,6 +1153,14 @@ var Stream = (function () {
this._c();
};

Stream.merge = function merge() {
var streams = [];
for (var _i = 0; _i < arguments.length; _i++) {
streams[_i - 0] = arguments[_i];
}
return new Stream(new MergeProducer(streams));
};

Stream.combine = function combine() {
var streams = [];
for (var _i = 0; _i < arguments.length; _i++) {
Expand Down
Loading

0 comments on commit 5829bf9

Please sign in to comment.