From d8b48666f4668c6b132da6461179a07c7fc11cde Mon Sep 17 00:00:00 2001
From: Leo Horie <leohorie@hotmail.com>
Date: Fri, 15 Jul 2016 01:22:47 -0400
Subject: [PATCH] rebuild

---
 index.js   |  2 +-
 mithril.js | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/index.js b/index.js
index 151d3d68..8ee79ef4 100644
--- a/index.js
+++ b/index.js
@@ -17,9 +17,9 @@ m.route = require("./api/router")(window, renderService, redrawService)
 m.mount = require("./api/mount")(renderService, redrawService)
 m.trust = require("./render/trust")
 m.prop = Stream.stream
-m.prop.sync = Stream.sync
 m.prop.combine = Stream.combine
 m.prop.reject = Stream.reject
+m.prop.merge = Stream.merge
 m.prop.HALT = Stream.HALT
 m.withAttr = require("./util/withAttr")
 m.render = renderService.render
diff --git a/mithril.js b/mithril.js
index da004c57..d5a1cdff 100644
--- a/mithril.js
+++ b/mithril.js
@@ -168,7 +168,12 @@ function reject(e) {
 	stream.error(e)
 	return stream
 }
-var Stream = {stream: createStream, combine: combine, reject: reject, HALT: HALT}
+function merge(streams) {
+	return combine(function () {
+		return streams.map(function (s) {return s()})
+	}, streams)
+}
+var Stream = {stream: createStream, merge: merge, combine: combine, reject: reject, HALT: HALT}
 function Node(tag, key, attrs, children, text, dom) {
 	return {tag: tag, key: key, attrs: attrs, children: children, text: text, dom: dom, domSize: undefined, state: {}, events: undefined, instance: undefined}
 }
@@ -1065,8 +1070,8 @@ m.route = function($window, renderer, pubsub) {
 			else {
 				renderer.render(root, Node(payload, null, args, undefined, undefined, undefined))
 			}
-		}, function() {
-			router.setPath(defaultRoute)
+		}, function(path, params) {
+			router.setPath(defaultRoute, params, {replace: true})
 		})
 		autoredraw(root, renderer, pubsub, replay)
 	}
@@ -1091,6 +1096,7 @@ m.trust = function(html) {
 m.prop = Stream.stream
 m.prop.combine = Stream.combine
 m.prop.reject = Stream.reject
+m.prop.merge = Stream.merge
 m.prop.HALT = Stream.HALT
 m.withAttr = function(attrName, callback, context) {
 	return function(e) {