From 992aa30ccc7b0678f4ff808a4c02477c1af1d64d Mon Sep 17 00:00:00 2001
From: Leo Horie <leohorie@hotmail.com>
Date: Tue, 6 Dec 2016 23:29:15 -0500
Subject: [PATCH] fix m.route.link and m.route.set history replacement

---
 README.md                         |  2 +-
 api/router.js                     | 16 +++++-
 api/tests/test-router.js          | 16 +++---
 mithril.js                        | 56 ++++++++++----------
 mithril.min.js                    | 82 ++++++++++++++---------------
 router/router.js                  | 46 ++++++----------
 router/tests/index.html           |  1 -
 router/tests/test-defineRoutes.js |  4 +-
 router/tests/test-getPath.js      |  2 +-
 router/tests/test-link.js         | 87 -------------------------------
 router/tests/test-setPath.js      |  4 +-
 11 files changed, 113 insertions(+), 203 deletions(-)
 delete mode 100644 router/tests/test-link.js

diff --git a/README.md b/README.md
index 4d6e53b3..11a87ed7 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,6 @@ There are over 4000 assertions in the test suite, and tests cover even difficult
 
 ## Modularity
 
-Despite the huge improvements in performance and modularity, the new codebase is smaller than v0.2.x, currently clocking at <!-- size -->7.46 KB<!-- /size --> min+gzip
+Despite the huge improvements in performance and modularity, the new codebase is smaller than v0.2.x, currently clocking at <!-- size -->7.47 KB<!-- /size --> min+gzip
 
 In addition, Mithril is now completely modular: you can import only the modules that you need and easily integrate 3rd party modules if you wish to use a different library for routing, ajax, and even rendering
diff --git a/api/router.js b/api/router.js
index be13d8a4..915739a5 100644
--- a/api/router.js
+++ b/api/router.js
@@ -41,11 +41,23 @@ module.exports = function($window, redrawService) {
 		redrawService.subscribe(root, run)
 	}
 	route.set = function(path, data, options) {
+		if (resolve != null) options = {replace: true}
 		resolve = null
 		routeService.setPath(path, data, options)
 	}
 	route.get = function() {return currentPath}
-	route.prefix = routeService.setPrefix
-	route.link = routeService.link
+	route.prefix = function(prefix) {routeService.prefix = prefix}
+	route.link = function(vnode) {
+		vnode.dom.setAttribute("href", routeService.prefix + vnode.attrs.href)
+		vnode.dom.onclick = function(e) {
+			if (e.ctrlKey || e.metaKey || e.shiftKey || e.which === 2) return
+			e.preventDefault()
+			e.redraw = false
+			var href = this.getAttribute("href")
+			if (href.indexOf(routeService.prefix) === 0) href = href.slice(routeService.prefix.length)
+			route.set(href, undefined, undefined)
+		}
+	}
+
 	return route
 }
diff --git a/api/tests/test-router.js b/api/tests/test-router.js
index 1f3020b7..3de4ee54 100644
--- a/api/tests/test-router.js
+++ b/api/tests/test-router.js
@@ -358,7 +358,7 @@ o.spec("route", function() {
 					})
 					callAsync(function() {
 						o(oninit.callCount).equals(1)
-						route.set('/def')
+						route.set("/def")
 						callAsync(function() {
 							o(oninit.callCount).equals(2)
 							done()
@@ -897,12 +897,14 @@ o.spec("route", function() {
 						},
 					})
 					
-					callAsync(function() {
-						callAsync(function() {
-							o(rendered).equals(false)
-							o(resolved).equals("b")
-							
-							done()
+					callAsync(function() { // tick for popstate for /a
+						callAsync(function() { // tick for promise in onmatch
+							callAsync(function() { // tick for onpopstate for /b
+								o(rendered).equals(false)
+								o(resolved).equals("b")
+								
+								done()
+							})
 						})
 					})
 				})
diff --git a/mithril.js b/mithril.js
index e3c8b8e0..d4cb36b8 100644
--- a/mithril.js
+++ b/mithril.js
@@ -988,8 +988,6 @@ var parseQueryString = function(string) {
 var coreRouter = function($window) {
 	var supportsPushState = typeof $window.history.pushState === "function"
 	var callAsync0 = typeof setImmediate === "function" ? setImmediate : setTimeout
-	var prefix1 = "#!"
-	function setPrefix(value) {prefix1 = value}
 	function normalize1(fragment0) {
 		var data = $window.location[fragment0].replace(/(?:%[a-f89][a-f0-9])+/gim, decodeURIComponent)
 		if (fragment0 === "pathname" && data[0] !== "/") data = "/" + data
@@ -1020,15 +1018,16 @@ var coreRouter = function($window) {
 		}
 		return path.slice(0, pathEnd)
 	}
-	function getPath() {
-		var type2 = prefix1.charAt(0)
+	var router = {prefix: "#!"}
+	router.getPath = function() {
+		var type2 = router.prefix.charAt(0)
 		switch (type2) {
-			case "#": return normalize1("hash").slice(prefix1.length)
-			case "?": return normalize1("search").slice(prefix1.length) + normalize1("hash")
-			default: return normalize1("pathname").slice(prefix1.length) + normalize1("search") + normalize1("hash")
+			case "#": return normalize1("hash").slice(router.prefix.length)
+			case "?": return normalize1("search").slice(router.prefix.length) + normalize1("hash")
+			default: return normalize1("pathname").slice(router.prefix.length) + normalize1("search") + normalize1("hash")
 		}
 	}
-	function setPath(path, data, options) {
+	router.setPath = function(path, data, options) {
 		var queryData = {}, hashData = {}
 		path = parsePath(path, queryData, hashData)
 		if (data != null) {
@@ -1043,15 +1042,15 @@ var coreRouter = function($window) {
 		var hash = buildQueryString(hashData)
 		if (hash) path += "#" + hash
 		if (supportsPushState) {
-			if (options && options.replace) $window.history.replaceState(null, null, prefix1 + path)
-			else $window.history.pushState(null, null, prefix1 + path)
+			if (options && options.replace) $window.history.replaceState(null, null, router.prefix + path)
+			else $window.history.pushState(null, null, router.prefix + path)
 			$window.onpopstate()
 		}
-		else $window.location.href = prefix1 + path
+		else $window.location.href = router.prefix + path
 	}
-	function defineRoutes(routes, resolve, reject) {
+	router.defineRoutes = function(routes, resolve, reject) {
 		function resolveRoute() {
-			var path = getPath()
+			var path = router.getPath()
 			var params = {}
 			var pathname = parsePath(path, params, params)
 			
@@ -1073,21 +1072,11 @@ var coreRouter = function($window) {
 		}
 		
 		if (supportsPushState) $window.onpopstate = debounceAsync(resolveRoute)
-		else if (prefix1.charAt(0) === "#") $window.onhashchange = resolveRoute
+		else if (router.prefix.charAt(0) === "#") $window.onhashchange = resolveRoute
 		resolveRoute()
 	}
-	function link(vnode2) {
-		vnode2.dom.setAttribute("href", prefix1 + vnode2.attrs.href)
-		vnode2.dom.onclick = function(e) {
-			if (e.ctrlKey || e.metaKey || e.shiftKey || e.which === 2) return
-			e.preventDefault()
-			e.redraw = false
-			var href = this.getAttribute("href")
-			if (href.indexOf(prefix1) === 0) href = href.slice(prefix1.length)
-			setPath(href, undefined, undefined)
-		}
-	}
-	return {setPrefix: setPrefix, getPath: getPath, setPath: setPath, defineRoutes: defineRoutes, link: link}
+	
+	return router
 }
 var _20 = function($window, redrawService0) {
 	var routeService = coreRouter($window)
@@ -1125,12 +1114,23 @@ var _20 = function($window, redrawService0) {
 		redrawService0.subscribe(root, run1)
 	}
 	route.set = function(path, data, options) {
+		if (resolve != null) options = {replace: true}
 		resolve = null
 		routeService.setPath(path, data, options)
 	}
 	route.get = function() {return currentPath}
-	route.prefix = routeService.setPrefix
-	route.link = routeService.link
+	route.prefix = function(prefix0) {routeService.prefix = prefix0}
+	route.link = function(vnode1) {
+		vnode1.dom.setAttribute("href", routeService.prefix + vnode1.attrs.href)
+		vnode1.dom.onclick = function(e) {
+			if (e.ctrlKey || e.metaKey || e.shiftKey || e.which === 2) return
+			e.preventDefault()
+			e.redraw = false
+			var href = this.getAttribute("href")
+			if (href.indexOf(routeService.prefix) === 0) href = href.slice(routeService.prefix.length)
+			route.set(href, undefined, undefined)
+		}
+	}
 	return route
 }
 m.route = _20(window, redrawService)
diff --git a/mithril.min.js b/mithril.min.js
index cf44690d..af119c16 100644
--- a/mithril.min.js
+++ b/mithril.min.js
@@ -1,41 +1,41 @@
-new function(){function r(a,c,k,d,g,l){return{tag:a,key:c,attrs:k,children:d,text:g,dom:l,domSize:void 0,state:{},events:void 0,instance:void 0,skip:!1}}function y(a){if(null==a||"string"!==typeof a&&null==a.view)throw Error("The selector must be either a string or a component.");if("string"===typeof a&&void 0===M[a]){for(var c,k,d=[],g={};c=R.exec(a);){var l=c[1],n=c[2];""===l&&""!==n?k=n:"#"===l?g.id=n:"."===l?d.push(n):"["===c[3][0]&&((l=c[6])&&(l=l.replace(/\\(["'])/g,"$1").replace(/\\\\/g,"\\")),
-"class"===c[4]?d.push(l):g[c[4]]=l||!0)}0<d.length&&(g.className=d.join(" "));M[a]=function(a,c){var l=!1,b,d,u=a.className||a["class"],t;for(t in g)a[t]=g[t];void 0!==u&&(void 0!==a["class"]&&(a["class"]=void 0,a.className=u),void 0!==g.className&&(a.className=g.className+" "+u));for(t in a)if("key"!==t){l=!0;break}c instanceof Array&&1==c.length&&null!=c[0]&&"#"===c[0].tag?d=c[0].children:b=c;return r(k||"div",a.key,l?a:void 0,b,d,void 0)}}var A;null!=arguments[1]&&("object"!==typeof arguments[1]||
-void 0!==arguments[1].tag||arguments[1]instanceof Array)?d=1:(A=arguments[1],d=2);if(arguments.length===d+1)c=arguments[d]instanceof Array?arguments[d]:[arguments[d]];else for(c=[];d<arguments.length;d++)c.push(arguments[d]);return"string"===typeof a?M[a](A||{},r.normalizeChildren(c)):r(a,A&&A.key,A||{},r.normalizeChildren(c),void 0,void 0)}function S(a){var c=0,k=null,d="function"===typeof requestAnimationFrame?requestAnimationFrame:setTimeout;return function(){var g=Date.now();0===c||16<=g-c?(c=
-g,a()):null===k&&(k=d(function(){k=null;a();c=Date.now()},16-(g-c)))}}r.normalize=function(a){return a instanceof Array?r("[",void 0,void 0,r.normalizeChildren(a),void 0,void 0):null!=a&&"object"!==typeof a?r("#",void 0,void 0,a,void 0,void 0):a};r.normalizeChildren=function(a){for(var c=0;c<a.length;c++)a[c]=r.normalize(a[c]);return a};var R=/(?:(^|#|\.)([^#\.\[\]]+))|(\[(.+?)(?:\s*=\s*("|'|)((?:\\["'\]]|.)*?)\5)?\])/g,M={};y.trust=function(a){null==a&&(a="");return r("<",void 0,void 0,a,void 0,
-void 0)};y.fragment=function(a,c){return r("[",a.key,a,r.normalizeChildren(c),void 0,void 0)};var w=function(a){function c(a,b){return function u(c){var h;try{if(!b||null==c||"object"!==typeof c&&"function"!==typeof c||"function"!==typeof(h=c.then))H(function(){b||0!==a.length||console.error("Possible unhandled promise rejection:",c);for(var d=0;d<a.length;d++)a[d](c);g.length=0;l.length=0;m.state=b;m.retry=function(){u(c)}});else{if(c===d)throw new TypeError("Promise can't be resolved w/ itself");
-k(h.bind(c))}}catch(C){A(C)}}}function k(a){function b(b){return function(a){0<c++||b(a)}}var c=0,d=b(A);try{a(b(n),d)}catch(t){d(t)}}if(!(this instanceof w))throw Error("Promise must be called with `new`");if("function"!==typeof a)throw new TypeError("executor must be a function");var d=this,g=[],l=[],n=c(g,!0),A=c(l,!1),m=d._instance={resolvers:g,rejectors:l},H="function"===typeof setImmediate?setImmediate:setTimeout;k(a)};w.prototype.then=function(a,c){function k(a,c,k,h){c.push(function(b){if("function"!==
-typeof a)k(b);else try{g(a(b))}catch(F){l&&l(F)}});"function"===typeof d.retry&&h===d.state&&d.retry()}var d=this._instance,g,l,n=new w(function(a,c){g=a;l=c});k(a,d.resolvers,g,!0);k(c,d.rejectors,l,!1);return n};w.prototype["catch"]=function(a){return this.then(null,a)};w.resolve=function(a){return a instanceof w?a:new w(function(c){c(a)})};w.reject=function(a){return new w(function(c,k){k(a)})};w.all=function(a){return new w(function(c,k){var d=a.length,g=0,l=[];if(0===a.length)c([]);else for(var n=
-0;n<a.length;n++)(function(n){function m(a){g++;l[n]=a;g===d&&c(l)}null==a[n]||"object"!==typeof a[n]&&"function"!==typeof a[n]||"function"!==typeof a[n].then?m(a[n]):a[n].then(m,k)})(n)})};w.race=function(a){return new w(function(c,k){for(var d=0;d<a.length;d++)a[d].then(c,k)})};"undefined"===typeof I&&("undefined"!==typeof window?window.Promise=w:"undefined"!==typeof global&&(global.Promise=w));var J="undefined"!==typeof I?I:w,K=function(a){function c(a,d){if(d instanceof Array)for(var g=0;g<d.length;g++)c(a+
-"["+g+"]",d[g]);else if("[object Object]"===Object.prototype.toString.call(d))for(g in d)c(a+"["+g+"]",d[g]);else k.push(encodeURIComponent(a)+(null!=d&&""!==d?"="+encodeURIComponent(d):""))}if("[object Object]"!==Object.prototype.toString.call(a))return"";var k=[],d;for(d in a)c(d,a[d]);return k.join("&")},N=function(a,c){function k(){function b(){0===--a&&"function"===typeof h&&h()}var a=0;return function t(c){var d=c.then;c.then=function(){a++;var g=d.apply(c,arguments);g.then(b,function(a){b();
-throw a;});return t(g)};return c}}function d(b,a){if("string"===typeof b){var c=b;b=a||{};null==b.url&&(b.url=c)}return b}function g(b,a){if(null==a)return b;for(var c=b.match(/:[^\/]+/gi)||[],d=0;d<c.length;d++){var g=c[d].slice(1);null!=a[g]&&(b=b.replace(c[d],a[g]),delete a[g])}return b}function l(a,c){var b=K(c);if(""!==b){var d=0>a.indexOf("?")?"?":"&";a+=d+b}return a}function n(a){try{return""!==a?JSON.parse(a):null}catch(F){throw Error(a);}}function A(a){return a.responseText}function m(a,
-c){if("function"===typeof a)if(c instanceof Array)for(var b=0;b<c.length;b++)c[b]=new a(c[b]);else return new a(c);return c}var r=0,h;return{request:function(b,h){var u=k();b=d(b,h);var t=new c(function(c,d){null==b.method&&(b.method="GET");b.method=b.method.toUpperCase();var k="boolean"===typeof b.useBody?b.useBody:"GET"!==b.method&&"TRACE"!==b.method;"function"!==typeof b.serialize&&(b.serialize="undefined"!==typeof FormData&&b.data instanceof FormData?function(a){return a}:JSON.stringify);"function"!==
-typeof b.deserialize&&(b.deserialize=n);"function"!==typeof b.extract&&(b.extract=A);b.url=g(b.url,b.data);k?b.data=b.serialize(b.data):b.url=l(b.url,b.data);var h=new a.XMLHttpRequest;h.open(b.method,b.url,"boolean"===typeof b.async?b.async:!0,"string"===typeof b.user?b.user:void 0,"string"===typeof b.password?b.password:void 0);b.serialize===JSON.stringify&&k&&h.setRequestHeader("Content-Type","application/json; charset=utf-8");b.deserialize===n&&h.setRequestHeader("Accept","application/json, text/*");
-b.withCredentials&&(h.withCredentials=b.withCredentials);"function"===typeof b.config&&(h=b.config(h,b)||h);h.onreadystatechange=function(){if(4===h.readyState)try{var a=b.extract!==A?b.extract(h,b):b.deserialize(b.extract(h,b));if(200<=h.status&&300>h.status||304===h.status)c(m(b.type,a));else{var g=Error(h.responseText),k;for(k in a)g[k]=a[k];d(g)}}catch(G){d(G)}};k&&null!=b.data?h.send(b.data):h.send()});return!0===b.background?t:u(t)},jsonp:function(b,h){var n=k();b=d(b,h);var t=new c(function(c,
-d){var h=b.callbackName||"_mithril_"+Math.round(1E16*Math.random())+"_"+r++,k=a.document.createElement("script");a[h]=function(d){k.parentNode.removeChild(k);c(m(b.type,d));delete a[h]};k.onerror=function(){k.parentNode.removeChild(k);d(Error("JSONP request failed"));delete a[h]};null==b.data&&(b.data={});b.url=g(b.url,b.data);b.data[b.callbackKey||"callback"]=h;k.src=l(b.url,b.data);a.document.documentElement.appendChild(k)});return!0===b.background?t:n(t)},setCompletionCallback:function(a){h=a}}}(window,
-J),Q=function(a){function c(e,f,a,b,c,d,h){for(;a<b;a++){var q=f[a];null!=q&&m(e,k(q,c,h),d)}}function k(e,f,a){var q=e.tag;null!=e.attrs&&D(e.attrs,e,f);if("string"===typeof q)switch(q){case "#":return e.dom=B.createTextNode(e.children);case "<":return d(e);case "[":var b=B.createDocumentFragment();null!=e.children&&(q=e.children,c(b,q,0,q.length,f,null,a));e.dom=b.firstChild;e.domSize=b.childNodes.length;return b;default:var h=e.tag;switch(e.tag){case "svg":a="http://www.w3.org/2000/svg";break;
-case "math":a="http://www.w3.org/1998/Math/MathML"}var g=(q=e.attrs)&&q.is,h=a?g?B.createElementNS(a,h,{is:g}):B.createElementNS(a,h):g?B.createElement(h,{is:g}):B.createElement(h);e.dom=h;if(null!=q)for(b in g=a,q)t(e,b,null,q[b],g);null!=e.attrs&&null!=e.attrs.contenteditable?H(e):(null!=e.text&&(""!==e.text?h.textContent=e.text:e.children=[r("#",void 0,void 0,e.text,void 0,void 0)]),null!=e.children&&(b=e.children,c(h,b,0,b.length,f,null,a),f=e.attrs,"select"===e.tag&&null!=f&&("value"in f&&t(e,
-"value",null,f.value,void 0),"selectedIndex"in f&&t(e,"selectedIndex",null,f.selectedIndex,void 0))));return h}else{e.state||(e.state={});y(e.state,e.tag);b=e.tag.view;if(null!=b.reentrantLock)e=P;else if(b.reentrantLock=!0,D(e.tag,e,f),e.instance=r.normalize(b.call(e.state,e)),b.reentrantLock=null,null!=e.instance){if(e.instance===e)throw Error("A view cannot return the vnode it received as arguments");f=k(e.instance,f,a);e.dom=e.instance.dom;e.domSize=null!=e.dom?e.instance.domSize:0;e=f}else e.domSize=
-0,e=P;return e}}function d(e){var f={caption:"table",thead:"table",tbody:"table",tfoot:"table",tr:"tbody",th:"tr",td:"tr",colgroup:"table",col:"colgroup"}[(e.children.match(/^\s*?<(\w+)/im)||[])[1]]||"div",f=B.createElement(f);f.innerHTML=e.children;e.dom=f.firstChild;e.domSize=f.childNodes.length;e=B.createDocumentFragment();for(var a;a=f.firstChild;)e.appendChild(a);return e}function g(e,f,a,b,d,g){if(f!==a&&(null!=f||null!=a))if(null==f)c(e,a,0,a.length,b,d,void 0);else if(null==a)h(f,0,f.length,
-a);else{for(var q=!1,v=0;v<a.length;v++)if(null!=a[v]){q=null==a[v].key;break}if(f.length===a.length&&q)for(v=0;v<f.length;v++)f[v]!==a[v]&&(null==f[v]?m(e,k(a[v],b,g),A(f,v+1,d)):null==a[v]?h(f,v,v+1,a):l(e,f[v],a[v],b,A(f,v+1,d),!1,g));else{a:{if(null!=f.pool&&Math.abs(f.pool.length-a.length)<=Math.abs(f.length-a.length)&&(q=a[0]&&a[0].children&&a[0].children.length||0,Math.abs((f.pool[0]&&f.pool[0].children&&f.pool[0].children.length||0)-q)<=Math.abs((f[0]&&f[0].children&&f[0].children.length||
-0)-q))){q=!0;break a}q=!1}q&&(f=f.concat(f.pool));for(var t=v=0,z=f.length-1,u=a.length-1,E;z>=v&&u>=t;){var x=f[v],p=a[t];if(x!==p||q)if(null==x)v++;else if(null==p)t++;else if(x.key===p.key)v++,t++,l(e,x,p,b,A(f,v,d),q,g),q&&x.tag===p.tag&&m(e,n(x),d);else if(x=f[z],x!==p||q)if(null==x)z--;else if(null==p)t++;else if(x.key===p.key)l(e,x,p,b,A(f,z+1,d),q,g),(q||t<u)&&m(e,n(x),A(f,v,d)),z--,t++;else break;else z--,t++;else v++,t++}for(;z>=v&&u>=t;){x=f[z];p=a[u];if(x!==p||q)if(null==x)z--;else{if(null!=
-p)if(x.key===p.key)l(e,x,p,b,A(f,z+1,d),q,g),q&&x.tag===p.tag&&m(e,n(x),d),null!=x.dom&&(d=x.dom),z--;else{if(!E){E=f;var x=z,r={},C;for(C=0;C<x;C++){var D=E[C];null!=D&&(D=D.key,null!=D&&(r[D]=C))}E=r}null!=p&&(x=E[p.key],null!=x?(r=f[x],l(e,r,p,b,A(f,z+1,d),q,g),m(e,n(r),d),f[x].skip=!0,null!=r.dom&&(d=r.dom)):(p=k(p,b,void 0),m(e,p,d),d=p))}u--}else z--,u--;if(u<t)break}c(e,a,t,u+1,b,d,g);h(f,v,z+1,a)}}}function l(a,f,b,c,h,z,u){var e=f.tag;if(e===b.tag){b.state=f.state;b.events=f.events;var q;
-var v;null!=b.attrs&&"function"===typeof b.attrs.onbeforeupdate&&(q=b.attrs.onbeforeupdate.call(b.state,b,f));"string"!==typeof b.tag&&"function"===typeof b.tag.onbeforeupdate&&(v=b.tag.onbeforeupdate.call(b.state,b,f));void 0===q&&void 0===v||q||v?q=!1:(b.dom=f.dom,b.domSize=f.domSize,b.instance=f.instance,q=!0);if(!q)if(null!=b.attrs&&w(b.attrs,b,c,z),"string"===typeof e)switch(e){case "#":f.children.toString()!==b.children.toString()&&(f.dom.nodeValue=b.children);b.dom=f.dom;break;case "<":f.children!==
-b.children?(n(f),m(a,d(b),h)):(b.dom=f.dom,b.domSize=f.domSize);break;case "[":g(a,f.children,b.children,c,h,u);f=0;c=b.children;b.dom=null;if(null!=c){for(var p=0;p<c.length;p++)a=c[p],null!=a&&null!=a.dom&&(null==b.dom&&(b.dom=a.dom),f+=a.domSize||1);1!==f&&(b.domSize=f)}break;default:a=u;h=b.dom=f.dom;switch(b.tag){case "svg":a="http://www.w3.org/2000/svg";break;case "math":a="http://www.w3.org/1998/Math/MathML"}"textarea"===b.tag&&(null==b.attrs&&(b.attrs={}),null!=b.text&&(b.attrs.value=b.text,
-b.text=void 0));z=f.attrs;u=b.attrs;e=a;if(null!=u)for(p in u)t(b,p,z&&z[p],u[p],e);if(null!=z)for(p in z)null!=u&&p in u||("className"===p&&(p="class"),"o"!==p[0]||"n"!==p[1]||E(p)?"key"!==p&&b.dom.removeAttribute(p):C(b,p,void 0));null!=b.attrs&&null!=b.attrs.contenteditable?H(b):null!=f.text&&null!=b.text&&""!==b.text?f.text.toString()!==b.text.toString()&&(f.dom.firstChild.nodeValue=b.text):(null!=f.text&&(f.children=[r("#",void 0,void 0,f.text,void 0,f.dom.firstChild)]),null!=b.text&&(b.children=
-[r("#",void 0,void 0,b.text,void 0,void 0)]),g(h,f.children,b.children,c,null,a))}else b.instance=r.normalize(b.tag.view.call(b.state,b)),w(b.tag,b,c,z),null!=b.instance?(null==f.instance?m(a,k(b.instance,c,u),h):l(a,f.instance,b.instance,c,h,z,u),b.dom=b.instance.dom,b.domSize=b.instance.domSize):null!=f.instance?(F(f.instance,null),b.dom=void 0,b.domSize=0):(b.dom=f.dom,b.domSize=f.domSize)}else F(f,null),m(a,k(b,c,u),h)}function n(b){var a=b.domSize;if(null!=a||null==b.dom){var e=B.createDocumentFragment();
-if(0<a){for(b=b.dom;--a;)e.appendChild(b.nextSibling);e.insertBefore(b,e.firstChild)}return e}return b.dom}function A(b,a,c){for(;a<b.length;a++)if(null!=b[a]&&null!=b[a].dom)return b[a].dom;return c}function m(b,a,c){c&&c.parentNode?b.insertBefore(a,c):b.appendChild(a)}function H(b){var a=b.children;if(null!=a&&1===a.length&&"<"===a[0].tag)a=a[0].children,b.dom.innerHTML!==a&&(b.dom.innerHTML=a);else if(null!=b.text||null!=a&&0!==a.length)throw Error("Child node of a contenteditable must be trusted");
-}function h(b,a,c,d){for(;a<c;a++){var e=b[a];null!=e&&(e.skip?e.skip=!1:F(e,d))}}function b(b){var a=!1;return function(){a||(a=!0,b())}}function F(a,f){function e(){if(++d===c&&(u(a),a.dom)){var b=a.domSize||1;if(1<b)for(var e=a.dom;--b;){var h=e.nextSibling,g=h.parentNode;null!=g&&g.removeChild(h)}b=a.dom;e=b.parentNode;null!=e&&e.removeChild(b);if(b=null!=f&&null==a.domSize)b=a.attrs,b=!(null!=b&&(b.oncreate||b.onupdate||b.onbeforeremove||b.onremove));b&&"string"===typeof a.tag&&(f.pool?f.pool.push(a):
-f.pool=[a])}}var c=1,d=0;a.attrs&&a.attrs.onbeforeremove&&(c++,a.attrs.onbeforeremove.call(a.state,a,b(e)));"string"!==typeof a.tag&&a.tag.onbeforeremove&&(c++,a.tag.onbeforeremove.call(a.state,a,b(e)));e()}function u(b){b.attrs&&b.attrs.onremove&&b.attrs.onremove.call(b.state,b);"string"!==typeof b.tag&&b.tag.onremove&&b.tag.onremove.call(b.state,b);if(null!=b.instance)u(b.instance);else if(b=b.children,b instanceof Array)for(var a=0;a<b.length;a++){var e=b[a];null!=e&&u(e)}}function t(b,a,c,d,h){var e=
-b.dom;if("key"!==a&&(c!==d||"value"===a||"checked"===a||"selectedIndex"===a||"selected"===a&&b.dom===B.activeElement||"object"===typeof d)&&"undefined"!==typeof d&&!E(a)){var f=a.indexOf(":");if(-1<f&&"xlink"===a.substr(0,f))e.setAttributeNS("http://www.w3.org/1999/xlink",a.slice(f+1),d);else if("o"===a[0]&&"n"===a[1]&&"function"===typeof d)C(b,a,d);else if("style"===a)if(b=c,b===d&&(e.style.cssText="",b=null),null==d)e.style.cssText="";else if("string"===typeof d)e.style.cssText=d;else{"string"===
-typeof b&&(e.style.cssText="");for(var g in d)e.style[g]=d[g];if(null!=b&&"string"!==typeof b)for(g in b)g in d||(e.style[g]="")}else a in e&&"href"!==a&&"list"!==a&&"form"!==a&&"width"!==a&&"height"!==a&&void 0===h?"input"===b.tag&&"value"===a&&b.dom.value===d&&b.dom===B.activeElement||"select"===b.tag&&"value"===a&&b.dom.value===d&&b.dom===B.activeElement||"option"===b.tag&&"value"===a&&b.dom.value===d||(e[a]=d):"boolean"===typeof d?d?e.setAttribute(a,""):e.removeAttribute(a):e.setAttribute("className"===
-a?"class":a,d)}}function E(b){return"oninit"===b||"oncreate"===b||"onupdate"===b||"onremove"===b||"onbeforeremove"===b||"onbeforeupdate"===b}function C(b,a,c){var d=b.dom,e="function"!==typeof G?c:function(b){var a=c.call(d,b);G.call(d,b);return a};if(a in d)d[a]="function"===typeof c?e:null;else{var f=a.slice(2);void 0===b.events&&(b.events={});b.events[a]!==e&&(null!=b.events[a]&&d.removeEventListener(f,b.events[a],!1),"function"===typeof c&&(b.events[a]=e,d.addEventListener(f,b.events[a],!1)))}}
-function D(b,a,c){"function"===typeof b.oninit&&b.oninit.call(a.state,a);"function"===typeof b.oncreate&&c.push(b.oncreate.bind(a.state,a))}function w(b,a,c,d){d?D(b,a,c):"function"===typeof b.onupdate&&c.push(b.onupdate.bind(a.state,a))}function y(b,a){Object.keys(a).forEach(function(c){b[c]=a[c]})}var B=a.document,P=B.createDocumentFragment(),G;return{render:function(b,a){if(!b)throw Error("Ensure the DOM element being passed to m.route/m.mount/m.render is not undefined.");var c=[],d=B.activeElement;
-null==b.vnodes&&(b.textContent="");a instanceof Array||(a=[a]);g(b,b.vnodes,r.normalizeChildren(a),c,null,void 0);b.vnodes=a;for(var e=0;e<c.length;e++)c[e]();B.activeElement!==d&&d.focus()},setEventCallback:function(b){return G=b}}},L=function(a){function c(a){a=d.indexOf(a);-1<a&&d.splice(a,2)}function k(){for(var a=1;a<d.length;a+=2)d[a]()}a=Q(a);a.setEventCallback(function(a){!1!==a.redraw&&k()});var d=[];return{subscribe:function(a,k){c(a);d.push(a,S(k))},unsubscribe:c,redraw:k,render:a.render}}(window);
-N.setCompletionCallback(L.redraw);y.mount=function(a){return function(c,k){if(null===k)a.render(c,[]),a.unsubscribe(c);else{if(null==k.view)throw Error("m.mount(element, component) expects a component, not a vnode");a.subscribe(c,function(){a.render(c,r(k))});a.redraw()}}}(L);var I=J,O=function(a){if(""===a||null==a)return{};"?"===a.charAt(0)&&(a=a.slice(1));a=a.split("&");for(var c={},k={},d=0;d<a.length;d++){var g=a[d].split("="),l=decodeURIComponent(g[0]),g=2===g.length?decodeURIComponent(g[1]):
-"";"true"===g?g=!0:"false"===g&&(g=!1);var n=l.split(/\]\[?|\[/),r=c;-1<l.indexOf("[")&&n.pop();for(var m=0;m<n.length;m++){var l=n[m],w=n[m+1],w=""==w||!isNaN(parseInt(w,10)),h=m===n.length-1;""===l&&(l=n.slice(0,m).join(),null==k[l]&&(k[l]=0),l=k[l]++);null==r[l]&&(r[l]=h?g:w?[]:{});r=r[l]}}return c},T=function(a){function c(c){var b=a.location[c].replace(/(?:%[a-f89][a-f0-9])+/gim,decodeURIComponent);"pathname"===c&&"/"!==b[0]&&(b="/"+b);return b}function k(a){return function(){null==w&&(w=r(function(){w=
-null;a()}))}}function d(a,b,c){var d=a.indexOf("?"),h=a.indexOf("#"),g=-1<d?d:-1<h?h:a.length;if(-1<d){var d=O(a.slice(d+1,-1<h?h:a.length)),k;for(k in d)b[k]=d[k]}if(-1<h)for(k in b=O(a.slice(h+1)),b)c[k]=b[k];return a.slice(0,g)}function g(){switch(m.charAt(0)){case "#":return c("hash").slice(m.length);case "?":return c("search").slice(m.length)+c("hash");default:return c("pathname").slice(m.length)+c("search")+c("hash")}}function l(c,b,g){var h={},k={};c=d(c,h,k);if(null!=b){for(var l in b)h[l]=
-b[l];c=c.replace(/:([^\/]+)/g,function(a,c){delete h[c];return b[c]})}(l=K(h))&&(c+="?"+l);(k=K(k))&&(c+="#"+k);n?(g&&g.replace?a.history.replaceState(null,null,m+c):a.history.pushState(null,null,m+c),a.onpopstate()):a.location.href=m+c}var n="function"===typeof a.history.pushState,r="function"===typeof setImmediate?setImmediate:setTimeout,m="#!",w;return{setPrefix:function(a){m=a},getPath:g,setPath:l,defineRoutes:function(c,b,l){function h(){var a=g(),h={},k=d(a,h,h),m;for(m in c){var n=new RegExp("^"+
-m.replace(/:[^\/]+?\.{3}/g,"(.*?)").replace(/:[^\/]+/g,"([^\\/]+)")+"/?$");if(n.test(k)){k.replace(n,function(){for(var d=m.match(/:[^\/]+/g)||[],g=[].slice.call(arguments,1,-2),k=0;k<d.length;k++)h[d[k].replace(/:|\./g,"")]=decodeURIComponent(g[k]);b(c[m],h,a,m)});return}}l(a,h)}n?a.onpopstate=k(h):"#"===m.charAt(0)&&(a.onhashchange=h);h()},link:function(a){a.dom.setAttribute("href",m+a.attrs.href);a.dom.onclick=function(a){a.ctrlKey||a.metaKey||a.shiftKey||2===a.which||(a.preventDefault(),a.redraw=
-!1,a=this.getAttribute("href"),0===a.indexOf(m)&&(a=a.slice(m.length)),l(a,void 0,void 0))}}}};y.route=function(a,c){var k=T(a),d=function(a){return a},g,l,n,w,m,y=function(a,b,y){if(null==a)throw Error("Ensure the DOM element that was passed to `m.route` is not undefined");var h=function(a,b,c,h){l=b||"div";n=c;w=h;m=null;g=(a.render||d).bind(a);t()},t=function(){null!=g&&c.render(a,g(r(l,n.key,n)))};k.defineRoutes(y,function(a,b,c){a.view?h({},a,b,c):a.onmatch?null!=m?h(a,l,b,c):(m=function(d){h(a,
-d,b,c)},I.resolve(a.onmatch(b,c)).then(function(a){null!=m&&m(a)})):h(a,"div",b,c)},function(){k.setPath(b)});c.subscribe(a,t)};y.set=function(a,b,c){m=null;k.setPath(a,b,c)};y.get=function(){return w};y.prefix=k.setPrefix;y.link=k.link;return y}(window,L);y.withAttr=function(a,c,k){return function(d){return c.call(k||this,a in d.currentTarget?d.currentTarget[a]:d.currentTarget.getAttribute(a))}};J=Q(window);y.render=J.render;y.redraw=L.redraw;y.request=N.request;y.jsonp=N.jsonp;y.parseQueryString=
-O;y.buildQueryString=K;y.version="1.0.0-rc.6";"undefined"!==typeof module?module.exports=y:window.m=y};
\ No newline at end of file
+new function(){function v(a,c,h,d,g,m){return{tag:a,key:c,attrs:h,children:d,text:g,dom:m,domSize:void 0,state:{},events:void 0,instance:void 0,skip:!1}}function z(a){if(null==a||"string"!==typeof a&&null==a.view)throw Error("The selector must be either a string or a component.");if("string"===typeof a&&void 0===K[a]){for(var c,h,d=[],g={};c=P.exec(a);){var m=c[1],l=c[2];""===m&&""!==l?h=l:"#"===m?g.id=l:"."===m?d.push(l):"["===c[3][0]&&((m=c[6])&&(m=m.replace(/\\(["'])/g,"$1").replace(/\\\\/g,"\\")),
+"class"===c[4]?d.push(m):g[c[4]]=m||!0)}0<d.length&&(g.className=d.join(" "));K[a]=function(a,c){var p=!1,b,m,d=a.className||a["class"],t;for(t in g)a[t]=g[t];void 0!==d&&(void 0!==a["class"]&&(a["class"]=void 0,a.className=d),void 0!==g.className&&(a.className=g.className+" "+d));for(t in a)if("key"!==t){p=!0;break}c instanceof Array&&1==c.length&&null!=c[0]&&"#"===c[0].tag?m=c[0].children:b=c;return v(h||"div",a.key,p?a:void 0,b,m,void 0)}}var n;null!=arguments[1]&&("object"!==typeof arguments[1]||
+void 0!==arguments[1].tag||arguments[1]instanceof Array)?d=1:(n=arguments[1],d=2);if(arguments.length===d+1)c=arguments[d]instanceof Array?arguments[d]:[arguments[d]];else for(c=[];d<arguments.length;d++)c.push(arguments[d]);return"string"===typeof a?K[a](n||{},v.normalizeChildren(c)):v(a,n&&n.key,n||{},v.normalizeChildren(c),void 0,void 0)}function Q(a){var c=0,h=null,d="function"===typeof requestAnimationFrame?requestAnimationFrame:setTimeout;return function(){var g=Date.now();0===c||16<=g-c?(c=
+g,a()):null===h&&(h=d(function(){h=null;a();c=Date.now()},16-(g-c)))}}v.normalize=function(a){return a instanceof Array?v("[",void 0,void 0,v.normalizeChildren(a),void 0,void 0):null!=a&&"object"!==typeof a?v("#",void 0,void 0,a,void 0,void 0):a};v.normalizeChildren=function(a){for(var c=0;c<a.length;c++)a[c]=v.normalize(a[c]);return a};var P=/(?:(^|#|\.)([^#\.\[\]]+))|(\[(.+?)(?:\s*=\s*("|'|)((?:\\["'\]]|.)*?)\5)?\])/g,K={};z.trust=function(a){null==a&&(a="");return v("<",void 0,void 0,a,void 0,
+void 0)};z.fragment=function(a,c){return v("[",a.key,a,v.normalizeChildren(c),void 0,void 0)};var y=function(a){function c(a,b){return function C(c){var l;try{if(!b||null==c||"object"!==typeof c&&"function"!==typeof c||"function"!==typeof(l=c.then))k(function(){b||0!==a.length||console.error("Possible unhandled promise rejection:",c);for(var d=0;d<a.length;d++)a[d](c);g.length=0;m.length=0;p.state=b;p.retry=function(){C(c)}});else{if(c===d)throw new TypeError("Promise can't be resolved w/ itself");
+h(l.bind(c))}}catch(R){n(R)}}}function h(a){function b(b){return function(a){0<c++||b(a)}}var c=0,d=b(n);try{a(b(l),d)}catch(t){d(t)}}if(!(this instanceof y))throw Error("Promise must be called with `new`");if("function"!==typeof a)throw new TypeError("executor must be a function");var d=this,g=[],m=[],l=c(g,!0),n=c(m,!1),p=d._instance={resolvers:g,rejectors:m},k="function"===typeof setImmediate?setImmediate:setTimeout;h(a)};y.prototype.then=function(a,c){function h(a,c,h,l){c.push(function(b){if("function"!==
+typeof a)h(b);else try{g(a(b))}catch(D){m&&m(D)}});"function"===typeof d.retry&&l===d.state&&d.retry()}var d=this._instance,g,m,l=new y(function(a,c){g=a;m=c});h(a,d.resolvers,g,!0);h(c,d.rejectors,m,!1);return l};y.prototype["catch"]=function(a){return this.then(null,a)};y.resolve=function(a){return a instanceof y?a:new y(function(c){c(a)})};y.reject=function(a){return new y(function(c,h){h(a)})};y.all=function(a){return new y(function(c,h){var d=a.length,g=0,m=[];if(0===a.length)c([]);else for(var l=
+0;l<a.length;l++)(function(l){function p(a){g++;m[l]=a;g===d&&c(m)}null==a[l]||"object"!==typeof a[l]&&"function"!==typeof a[l]||"function"!==typeof a[l].then?p(a[l]):a[l].then(p,h)})(l)})};y.race=function(a){return new y(function(c,h){for(var d=0;d<a.length;d++)a[d].then(c,h)})};"undefined"===typeof F&&("undefined"!==typeof window?window.Promise=y:"undefined"!==typeof global&&(global.Promise=y));var H="undefined"!==typeof F?F:y,I=function(a){function c(a,d){if(d instanceof Array)for(var g=0;g<d.length;g++)c(a+
+"["+g+"]",d[g]);else if("[object Object]"===Object.prototype.toString.call(d))for(g in d)c(a+"["+g+"]",d[g]);else h.push(encodeURIComponent(a)+(null!=d&&""!==d?"="+encodeURIComponent(d):""))}if("[object Object]"!==Object.prototype.toString.call(a))return"";var h=[],d;for(d in a)c(d,a[d]);return h.join("&")},L=function(a,c){function h(){function b(){0===--a&&"function"===typeof r&&r()}var a=0;return function t(c){var d=c.then;c.then=function(){a++;var g=d.apply(c,arguments);g.then(b,function(a){b();
+throw a;});return t(g)};return c}}function d(b,a){if("string"===typeof b){var c=b;b=a||{};null==b.url&&(b.url=c)}return b}function g(b,a){if(null==a)return b;for(var c=b.match(/:[^\/]+/gi)||[],d=0;d<c.length;d++){var g=c[d].slice(1);null!=a[g]&&(b=b.replace(c[d],a[g]),delete a[g])}return b}function m(a,c){var b=I(c);if(""!==b){var d=0>a.indexOf("?")?"?":"&";a+=d+b}return a}function l(a){try{return""!==a?JSON.parse(a):null}catch(D){throw Error(a);}}function n(a){return a.responseText}function p(a,
+c){if("function"===typeof a)if(c instanceof Array)for(var b=0;b<c.length;b++)c[b]=new a(c[b]);else return new a(c);return c}var k=0,r;return{request:function(b,k){var r=h();b=d(b,k);var t=new c(function(c,d){null==b.method&&(b.method="GET");b.method=b.method.toUpperCase();var h="boolean"===typeof b.useBody?b.useBody:"GET"!==b.method&&"TRACE"!==b.method;"function"!==typeof b.serialize&&(b.serialize="undefined"!==typeof FormData&&b.data instanceof FormData?function(a){return a}:JSON.stringify);"function"!==
+typeof b.deserialize&&(b.deserialize=l);"function"!==typeof b.extract&&(b.extract=n);b.url=g(b.url,b.data);h?b.data=b.serialize(b.data):b.url=m(b.url,b.data);var k=new a.XMLHttpRequest;k.open(b.method,b.url,"boolean"===typeof b.async?b.async:!0,"string"===typeof b.user?b.user:void 0,"string"===typeof b.password?b.password:void 0);b.serialize===JSON.stringify&&h&&k.setRequestHeader("Content-Type","application/json; charset=utf-8");b.deserialize===l&&k.setRequestHeader("Accept","application/json, text/*");
+b.withCredentials&&(k.withCredentials=b.withCredentials);"function"===typeof b.config&&(k=b.config(k,b)||k);k.onreadystatechange=function(){if(4===k.readyState)try{var a=b.extract!==n?b.extract(k,b):b.deserialize(b.extract(k,b));if(200<=k.status&&300>k.status||304===k.status)c(p(b.type,a));else{var g=Error(k.responseText),h;for(h in a)g[h]=a[h];d(g)}}catch(G){d(G)}};h&&null!=b.data?k.send(b.data):k.send()});return!0===b.background?t:r(t)},jsonp:function(b,l){var n=h();b=d(b,l);var t=new c(function(c,
+d){var h=b.callbackName||"_mithril_"+Math.round(1E16*Math.random())+"_"+k++,l=a.document.createElement("script");a[h]=function(d){l.parentNode.removeChild(l);c(p(b.type,d));delete a[h]};l.onerror=function(){l.parentNode.removeChild(l);d(Error("JSONP request failed"));delete a[h]};null==b.data&&(b.data={});b.url=g(b.url,b.data);b.data[b.callbackKey||"callback"]=h;l.src=m(b.url,b.data);a.document.documentElement.appendChild(l)});return!0===b.background?t:n(t)},setCompletionCallback:function(a){r=a}}}(window,
+H),O=function(a){function c(e,f,a,b,c,d,g){for(;a<b;a++){var q=f[a];null!=q&&p(e,h(q,c,g),d)}}function h(e,f,a){var q=e.tag;null!=e.attrs&&z(e.attrs,e,f);if("string"===typeof q)switch(q){case "#":return e.dom=B.createTextNode(e.children);case "<":return d(e);case "[":var b=B.createDocumentFragment();null!=e.children&&(q=e.children,c(b,q,0,q.length,f,null,a));e.dom=b.firstChild;e.domSize=b.childNodes.length;return b;default:var g=e.tag;switch(e.tag){case "svg":a="http://www.w3.org/2000/svg";break;
+case "math":a="http://www.w3.org/1998/Math/MathML"}var p=(q=e.attrs)&&q.is,g=a?p?B.createElementNS(a,g,{is:p}):B.createElementNS(a,g):p?B.createElement(g,{is:p}):B.createElement(g);e.dom=g;if(null!=q)for(b in p=a,q)t(e,b,null,q[b],p);null!=e.attrs&&null!=e.attrs.contenteditable?k(e):(null!=e.text&&(""!==e.text?g.textContent=e.text:e.children=[v("#",void 0,void 0,e.text,void 0,void 0)]),null!=e.children&&(b=e.children,c(g,b,0,b.length,f,null,a),f=e.attrs,"select"===e.tag&&null!=f&&("value"in f&&t(e,
+"value",null,f.value,void 0),"selectedIndex"in f&&t(e,"selectedIndex",null,f.selectedIndex,void 0))));return g}else{e.state||(e.state={});S(e.state,e.tag);b=e.tag.view;if(null!=b.reentrantLock)e=F;else if(b.reentrantLock=!0,z(e.tag,e,f),e.instance=v.normalize(b.call(e.state,e)),b.reentrantLock=null,null!=e.instance){if(e.instance===e)throw Error("A view cannot return the vnode it received as arguments");f=h(e.instance,f,a);e.dom=e.instance.dom;e.domSize=null!=e.dom?e.instance.domSize:0;e=f}else e.domSize=
+0,e=F;return e}}function d(e){var f={caption:"table",thead:"table",tbody:"table",tfoot:"table",tr:"tbody",th:"tr",td:"tr",colgroup:"table",col:"colgroup"}[(e.children.match(/^\s*?<(\w+)/im)||[])[1]]||"div",f=B.createElement(f);f.innerHTML=e.children;e.dom=f.firstChild;e.domSize=f.childNodes.length;e=B.createDocumentFragment();for(var a;a=f.firstChild;)e.appendChild(a);return e}function g(e,f,a,b,d,g){if(f!==a&&(null!=f||null!=a))if(null==f)c(e,a,0,a.length,b,d,void 0);else if(null==a)r(f,0,f.length,
+a);else{for(var q=!1,k=0;k<a.length;k++)if(null!=a[k]){q=null==a[k].key;break}if(f.length===a.length&&q)for(k=0;k<f.length;k++)f[k]!==a[k]&&(null==f[k]?p(e,h(a[k],b,g),n(f,k+1,d)):null==a[k]?r(f,k,k+1,a):m(e,f[k],a[k],b,n(f,k+1,d),!1,g));else{a:{if(null!=f.pool&&Math.abs(f.pool.length-a.length)<=Math.abs(f.length-a.length)&&(q=a[0]&&a[0].children&&a[0].children.length||0,Math.abs((f.pool[0]&&f.pool[0].children&&f.pool[0].children.length||0)-q)<=Math.abs((f[0]&&f[0].children&&f[0].children.length||
+0)-q))){q=!0;break a}q=!1}q&&(f=f.concat(f.pool));for(var A=k=0,x=f.length-1,t=a.length-1,D;x>=k&&t>=A;){var w=f[k],u=a[A];if(w!==u||q)if(null==w)k++;else if(null==u)A++;else if(w.key===u.key)k++,A++,m(e,w,u,b,n(f,k,d),q,g),q&&w.tag===u.tag&&p(e,l(w),d);else if(w=f[x],w!==u||q)if(null==w)x--;else if(null==u)A++;else if(w.key===u.key)m(e,w,u,b,n(f,x+1,d),q,g),(q||A<t)&&p(e,l(w),n(f,k,d)),x--,A++;else break;else x--,A++;else k++,A++}for(;x>=k&&t>=A;){w=f[x];u=a[t];if(w!==u||q)if(null==w)x--;else{if(null!=
+u)if(w.key===u.key)m(e,w,u,b,n(f,x+1,d),q,g),q&&w.tag===u.tag&&p(e,l(w),d),null!=w.dom&&(d=w.dom),x--;else{if(!D){D=f;var w=x,C={},E;for(E=0;E<w;E++){var v=D[E];null!=v&&(v=v.key,null!=v&&(C[v]=E))}D=C}null!=u&&(w=D[u.key],null!=w?(C=f[w],m(e,C,u,b,n(f,x+1,d),q,g),p(e,l(C),d),f[w].skip=!0,null!=C.dom&&(d=C.dom)):(u=h(u,b,void 0),p(e,u,d),d=u))}t--}else x--,t--;if(t<A)break}c(e,a,A,t+1,b,d,g);r(f,k,x+1,a)}}}function m(a,f,b,c,u,x,n){var e=f.tag;if(e===b.tag){b.state=f.state;b.events=f.events;var q;
+var A;null!=b.attrs&&"function"===typeof b.attrs.onbeforeupdate&&(q=b.attrs.onbeforeupdate.call(b.state,b,f));"string"!==typeof b.tag&&"function"===typeof b.tag.onbeforeupdate&&(A=b.tag.onbeforeupdate.call(b.state,b,f));void 0===q&&void 0===A||q||A?q=!1:(b.dom=f.dom,b.domSize=f.domSize,b.instance=f.instance,q=!0);if(!q)if(null!=b.attrs&&N(b.attrs,b,c,x),"string"===typeof e)switch(e){case "#":f.children.toString()!==b.children.toString()&&(f.dom.nodeValue=b.children);b.dom=f.dom;break;case "<":f.children!==
+b.children?(l(f),p(a,d(b),u)):(b.dom=f.dom,b.domSize=f.domSize);break;case "[":g(a,f.children,b.children,c,u,n);f=0;c=b.children;b.dom=null;if(null!=c){for(var r=0;r<c.length;r++)a=c[r],null!=a&&null!=a.dom&&(null==b.dom&&(b.dom=a.dom),f+=a.domSize||1);1!==f&&(b.domSize=f)}break;default:a=n;u=b.dom=f.dom;switch(b.tag){case "svg":a="http://www.w3.org/2000/svg";break;case "math":a="http://www.w3.org/1998/Math/MathML"}"textarea"===b.tag&&(null==b.attrs&&(b.attrs={}),null!=b.text&&(b.attrs.value=b.text,
+b.text=void 0));x=f.attrs;n=b.attrs;e=a;if(null!=n)for(r in n)t(b,r,x&&x[r],n[r],e);if(null!=x)for(r in x)null!=n&&r in n||("className"===r&&(r="class"),"o"!==r[0]||"n"!==r[1]||E(r)?"key"!==r&&b.dom.removeAttribute(r):y(b,r,void 0));null!=b.attrs&&null!=b.attrs.contenteditable?k(b):null!=f.text&&null!=b.text&&""!==b.text?f.text.toString()!==b.text.toString()&&(f.dom.firstChild.nodeValue=b.text):(null!=f.text&&(f.children=[v("#",void 0,void 0,f.text,void 0,f.dom.firstChild)]),null!=b.text&&(b.children=
+[v("#",void 0,void 0,b.text,void 0,void 0)]),g(u,f.children,b.children,c,null,a))}else b.instance=v.normalize(b.tag.view.call(b.state,b)),N(b.tag,b,c,x),null!=b.instance?(null==f.instance?p(a,h(b.instance,c,n),u):m(a,f.instance,b.instance,c,u,x,n),b.dom=b.instance.dom,b.domSize=b.instance.domSize):null!=f.instance?(D(f.instance,null),b.dom=void 0,b.domSize=0):(b.dom=f.dom,b.domSize=f.domSize)}else D(f,null),p(a,h(b,c,n),u)}function l(b){var a=b.domSize;if(null!=a||null==b.dom){var e=B.createDocumentFragment();
+if(0<a){for(b=b.dom;--a;)e.appendChild(b.nextSibling);e.insertBefore(b,e.firstChild)}return e}return b.dom}function n(b,a,c){for(;a<b.length;a++)if(null!=b[a]&&null!=b[a].dom)return b[a].dom;return c}function p(b,a,c){c&&c.parentNode?b.insertBefore(a,c):b.appendChild(a)}function k(b){var a=b.children;if(null!=a&&1===a.length&&"<"===a[0].tag)a=a[0].children,b.dom.innerHTML!==a&&(b.dom.innerHTML=a);else if(null!=b.text||null!=a&&0!==a.length)throw Error("Child node of a contenteditable must be trusted");
+}function r(b,a,c,d){for(;a<c;a++){var e=b[a];null!=e&&(e.skip?e.skip=!1:D(e,d))}}function b(b){var a=!1;return function(){a||(a=!0,b())}}function D(a,f){function e(){if(++d===c&&(C(a),a.dom)){var b=a.domSize||1;if(1<b)for(var e=a.dom;--b;){var g=e.nextSibling,k=g.parentNode;null!=k&&k.removeChild(g)}b=a.dom;e=b.parentNode;null!=e&&e.removeChild(b);if(b=null!=f&&null==a.domSize)b=a.attrs,b=!(null!=b&&(b.oncreate||b.onupdate||b.onbeforeremove||b.onremove));b&&"string"===typeof a.tag&&(f.pool?f.pool.push(a):
+f.pool=[a])}}var c=1,d=0;a.attrs&&a.attrs.onbeforeremove&&(c++,a.attrs.onbeforeremove.call(a.state,a,b(e)));"string"!==typeof a.tag&&a.tag.onbeforeremove&&(c++,a.tag.onbeforeremove.call(a.state,a,b(e)));e()}function C(b){b.attrs&&b.attrs.onremove&&b.attrs.onremove.call(b.state,b);"string"!==typeof b.tag&&b.tag.onremove&&b.tag.onremove.call(b.state,b);if(null!=b.instance)C(b.instance);else if(b=b.children,b instanceof Array)for(var a=0;a<b.length;a++){var e=b[a];null!=e&&C(e)}}function t(b,a,c,d,g){var e=
+b.dom;if("key"!==a&&(c!==d||"value"===a||"checked"===a||"selectedIndex"===a||"selected"===a&&b.dom===B.activeElement||"object"===typeof d)&&"undefined"!==typeof d&&!E(a)){var f=a.indexOf(":");if(-1<f&&"xlink"===a.substr(0,f))e.setAttributeNS("http://www.w3.org/1999/xlink",a.slice(f+1),d);else if("o"===a[0]&&"n"===a[1]&&"function"===typeof d)y(b,a,d);else if("style"===a)if(b=c,b===d&&(e.style.cssText="",b=null),null==d)e.style.cssText="";else if("string"===typeof d)e.style.cssText=d;else{"string"===
+typeof b&&(e.style.cssText="");for(var k in d)e.style[k]=d[k];if(null!=b&&"string"!==typeof b)for(k in b)k in d||(e.style[k]="")}else a in e&&"href"!==a&&"list"!==a&&"form"!==a&&"width"!==a&&"height"!==a&&void 0===g?"input"===b.tag&&"value"===a&&b.dom.value===d&&b.dom===B.activeElement||"select"===b.tag&&"value"===a&&b.dom.value===d&&b.dom===B.activeElement||"option"===b.tag&&"value"===a&&b.dom.value===d||(e[a]=d):"boolean"===typeof d?d?e.setAttribute(a,""):e.removeAttribute(a):e.setAttribute("className"===
+a?"class":a,d)}}function E(b){return"oninit"===b||"oncreate"===b||"onupdate"===b||"onremove"===b||"onbeforeremove"===b||"onbeforeupdate"===b}function y(b,a,c){var d=b.dom,e="function"!==typeof G?c:function(b){var a=c.call(d,b);G.call(d,b);return a};if(a in d)d[a]="function"===typeof c?e:null;else{var f=a.slice(2);void 0===b.events&&(b.events={});b.events[a]!==e&&(null!=b.events[a]&&d.removeEventListener(f,b.events[a],!1),"function"===typeof c&&(b.events[a]=e,d.addEventListener(f,b.events[a],!1)))}}
+function z(b,a,c){"function"===typeof b.oninit&&b.oninit.call(a.state,a);"function"===typeof b.oncreate&&c.push(b.oncreate.bind(a.state,a))}function N(b,a,c,d){d?z(b,a,c):"function"===typeof b.onupdate&&c.push(b.onupdate.bind(a.state,a))}function S(b,a){Object.keys(a).forEach(function(c){b[c]=a[c]})}var B=a.document,F=B.createDocumentFragment(),G;return{render:function(b,a){if(!b)throw Error("Ensure the DOM element being passed to m.route/m.mount/m.render is not undefined.");var c=[],d=B.activeElement;
+null==b.vnodes&&(b.textContent="");a instanceof Array||(a=[a]);g(b,b.vnodes,v.normalizeChildren(a),c,null,void 0);b.vnodes=a;for(var e=0;e<c.length;e++)c[e]();B.activeElement!==d&&d.focus()},setEventCallback:function(b){return G=b}}},J=function(a){function c(a){a=d.indexOf(a);-1<a&&d.splice(a,2)}function h(){for(var a=1;a<d.length;a+=2)d[a]()}a=O(a);a.setEventCallback(function(a){!1!==a.redraw&&h()});var d=[];return{subscribe:function(a,h){c(a);d.push(a,Q(h))},unsubscribe:c,redraw:h,render:a.render}}(window);
+L.setCompletionCallback(J.redraw);z.mount=function(a){return function(c,h){if(null===h)a.render(c,[]),a.unsubscribe(c);else{if(null==h.view)throw Error("m.mount(element, component) expects a component, not a vnode");a.subscribe(c,function(){a.render(c,v(h))});a.redraw()}}}(J);var F=H,M=function(a){if(""===a||null==a)return{};"?"===a.charAt(0)&&(a=a.slice(1));a=a.split("&");for(var c={},h={},d=0;d<a.length;d++){var g=a[d].split("="),m=decodeURIComponent(g[0]),g=2===g.length?decodeURIComponent(g[1]):
+"";"true"===g?g=!0:"false"===g&&(g=!1);var l=m.split(/\]\[?|\[/),n=c;-1<m.indexOf("[")&&l.pop();for(var p=0;p<l.length;p++){var m=l[p],k=l[p+1],k=""==k||!isNaN(parseInt(k,10)),r=p===l.length-1;""===m&&(m=l.slice(0,p).join(),null==h[m]&&(h[m]=0),m=h[m]++);null==n[m]&&(n[m]=r?g:k?[]:{});n=n[m]}}return c},T=function(a){function c(c){var d=a.location[c].replace(/(?:%[a-f89][a-f0-9])+/gim,decodeURIComponent);"pathname"===c&&"/"!==d[0]&&(d="/"+d);return d}function h(a){return function(){null==l&&(l=m(function(){l=
+null;a()}))}}function d(a,c,d){var b=a.indexOf("?"),g=a.indexOf("#"),k=-1<b?b:-1<g?g:a.length;if(-1<b){var b=M(a.slice(b+1,-1<g?g:a.length)),h;for(h in b)c[h]=b[h]}if(-1<g)for(h in c=M(a.slice(g+1)),c)d[h]=c[h];return a.slice(0,k)}var g="function"===typeof a.history.pushState,m="function"===typeof setImmediate?setImmediate:setTimeout,l,n={prefix:"#!",getPath:function(){switch(n.prefix.charAt(0)){case "#":return c("hash").slice(n.prefix.length);case "?":return c("search").slice(n.prefix.length)+c("hash");
+default:return c("pathname").slice(n.prefix.length)+c("search")+c("hash")}},setPath:function(c,k,h){var b={},l={};c=d(c,b,l);if(null!=k){for(var m in k)b[m]=k[m];c=c.replace(/:([^\/]+)/g,function(a,c){delete b[c];return k[c]})}(m=I(b))&&(c+="?"+m);(l=I(l))&&(c+="#"+l);g?(h&&h.replace?a.history.replaceState(null,null,n.prefix+c):a.history.pushState(null,null,n.prefix+c),a.onpopstate()):a.location.href=n.prefix+c},defineRoutes:function(c,k,l){function b(){var a=n.getPath(),b={},g=d(a,b,b),h;for(h in c){var m=
+new RegExp("^"+h.replace(/:[^\/]+?\.{3}/g,"(.*?)").replace(/:[^\/]+/g,"([^\\/]+)")+"/?$");if(m.test(g)){g.replace(m,function(){for(var d=h.match(/:[^\/]+/g)||[],g=[].slice.call(arguments,1,-2),l=0;l<d.length;l++)b[d[l].replace(/:|\./g,"")]=decodeURIComponent(g[l]);k(c[h],b,a,h)});return}}l(a,b)}g?a.onpopstate=h(b):"#"===n.prefix.charAt(0)&&(a.onhashchange=b);b()}};return n};z.route=function(a,c){var h=T(a),d=function(a){return a},g,m,l,n,p,k=function(a,b,k){if(null==a)throw Error("Ensure the DOM element that was passed to `m.route` is not undefined");
+var r=function(a,b,c,h){m=b||"div";l=c;n=h;p=null;g=(a.render||d).bind(a);t()},t=function(){null!=g&&c.render(a,g(v(m,l.key,l)))};h.defineRoutes(k,function(a,b,c){a.view?r({},a,b,c):a.onmatch?null!=p?r(a,m,b,c):(p=function(d){r(a,d,b,c)},F.resolve(a.onmatch(b,c)).then(function(a){null!=p&&p(a)})):r(a,"div",b,c)},function(){h.setPath(b)});c.subscribe(a,t)};k.set=function(a,b,c){null!=p&&(c={replace:!0});p=null;h.setPath(a,b,c)};k.get=function(){return n};k.prefix=function(a){h.prefix=a};k.link=function(a){a.dom.setAttribute("href",
+h.prefix+a.attrs.href);a.dom.onclick=function(a){a.ctrlKey||a.metaKey||a.shiftKey||2===a.which||(a.preventDefault(),a.redraw=!1,a=this.getAttribute("href"),0===a.indexOf(h.prefix)&&(a=a.slice(h.prefix.length)),k.set(a,void 0,void 0))}};return k}(window,J);z.withAttr=function(a,c,h){return function(d){return c.call(h||this,a in d.currentTarget?d.currentTarget[a]:d.currentTarget.getAttribute(a))}};H=O(window);z.render=H.render;z.redraw=J.redraw;z.request=L.request;z.jsonp=L.jsonp;z.parseQueryString=
+M;z.buildQueryString=I;z.version="1.0.0-rc.6";"undefined"!==typeof module?module.exports=z:window.m=z};
\ No newline at end of file
diff --git a/router/router.js b/router/router.js
index 869595ae..6e1d7270 100644
--- a/router/router.js
+++ b/router/router.js
@@ -7,9 +7,6 @@ module.exports = function($window) {
 	var supportsPushState = typeof $window.history.pushState === "function"
 	var callAsync = typeof setImmediate === "function" ? setImmediate : setTimeout
 
-	var prefix = "#!"
-	function setPrefix(value) {prefix = value}
-
 	function normalize(fragment) {
 		var data = $window.location[fragment].replace(/(?:%[a-f89][a-f0-9])+/gim, decodeURIComponent)
 		if (fragment === "pathname" && data[0] !== "/") data = "/" + data
@@ -43,16 +40,16 @@ module.exports = function($window) {
 		return path.slice(0, pathEnd)
 	}
 
-	function getPath() {
-		var type = prefix.charAt(0)
+	var router = {prefix: "#!"}
+	router.getPath = function() {
+		var type = router.prefix.charAt(0)
 		switch (type) {
-			case "#": return normalize("hash").slice(prefix.length)
-			case "?": return normalize("search").slice(prefix.length) + normalize("hash")
-			default: return normalize("pathname").slice(prefix.length) + normalize("search") + normalize("hash")
+			case "#": return normalize("hash").slice(router.prefix.length)
+			case "?": return normalize("search").slice(router.prefix.length) + normalize("hash")
+			default: return normalize("pathname").slice(router.prefix.length) + normalize("search") + normalize("hash")
 		}
 	}
-
-	function setPath(path, data, options) {
+	router.setPath = function(path, data, options) {
 		var queryData = {}, hashData = {}
 		path = parsePath(path, queryData, hashData)
 		if (data != null) {
@@ -70,16 +67,15 @@ module.exports = function($window) {
 		if (hash) path += "#" + hash
 
 		if (supportsPushState) {
-			if (options && options.replace) $window.history.replaceState(null, null, prefix + path)
-			else $window.history.pushState(null, null, prefix + path)
+			if (options && options.replace) $window.history.replaceState(null, null, router.prefix + path)
+			else $window.history.pushState(null, null, router.prefix + path)
 			$window.onpopstate()
 		}
-		else $window.location.href = prefix + path
+		else $window.location.href = router.prefix + path
 	}
-
-	function defineRoutes(routes, resolve, reject) {
+	router.defineRoutes = function(routes, resolve, reject) {
 		function resolveRoute() {
-			var path = getPath()
+			var path = router.getPath()
 			var params = {}
 			var pathname = parsePath(path, params, params)
 			
@@ -103,21 +99,9 @@ module.exports = function($window) {
 		}
 		
 		if (supportsPushState) $window.onpopstate = debounceAsync(resolveRoute)
-		else if (prefix.charAt(0) === "#") $window.onhashchange = resolveRoute
+		else if (router.prefix.charAt(0) === "#") $window.onhashchange = resolveRoute
 		resolveRoute()
 	}
-
-	function link(vnode) {
-		vnode.dom.setAttribute("href", prefix + vnode.attrs.href)
-		vnode.dom.onclick = function(e) {
-			if (e.ctrlKey || e.metaKey || e.shiftKey || e.which === 2) return
-			e.preventDefault()
-			e.redraw = false
-			var href = this.getAttribute("href")
-			if (href.indexOf(prefix) === 0) href = href.slice(prefix.length)
-			setPath(href, undefined, undefined)
-		}
-	}
-
-	return {setPrefix: setPrefix, getPath: getPath, setPath: setPath, defineRoutes: defineRoutes, link: link}
+	
+	return router
 }
diff --git a/router/tests/index.html b/router/tests/index.html
index 2eb768d9..1f186449 100644
--- a/router/tests/index.html
+++ b/router/tests/index.html
@@ -20,7 +20,6 @@
 		<script src="test-defineRoutes.js"></script>
 		<script src="test-getPath.js"></script>
 		<script src="test-setPath.js"></script>
-		<script src="test-link.js"></script>
 
 		<script>require("../../ospec/ospec").run()</script>
 	</body>
diff --git a/router/tests/test-defineRoutes.js b/router/tests/test-defineRoutes.js
index b00530b7..51b3cc09 100644
--- a/router/tests/test-defineRoutes.js
+++ b/router/tests/test-defineRoutes.js
@@ -14,7 +14,7 @@ o.spec("Router.defineRoutes", function() {
 				o.beforeEach(function() {
 					$window = pushStateMock(env)
 					router = new Router($window)
-					router.setPrefix(prefix)
+					router.prefix = prefix
 					onRouteChange = o.spy()
 					onFail = o.spy()
 				})
@@ -73,7 +73,7 @@ o.spec("Router.defineRoutes", function() {
 					$window.location.href = "file://" + prefix + "/test"
 
 					router = new Router($window)
-					router.setPrefix(prefix)
+					router.prefix = prefix
 
 					router.defineRoutes({"/test": {data: 1}}, onRouteChange, onFail)
 
diff --git a/router/tests/test-getPath.js b/router/tests/test-getPath.js
index 119c1713..6c5dc2b2 100644
--- a/router/tests/test-getPath.js
+++ b/router/tests/test-getPath.js
@@ -13,7 +13,7 @@ o.spec("Router.getPath", function() {
 				o.beforeEach(function() {
 					$window = pushStateMock(env)
 					router = new Router($window)
-					router.setPrefix(prefix)
+					router.prefix = prefix
 					onRouteChange = o.spy()
 					onFail = o.spy()
 				})
diff --git a/router/tests/test-link.js b/router/tests/test-link.js
deleted file mode 100644
index 3d07af2e..00000000
--- a/router/tests/test-link.js
+++ /dev/null
@@ -1,87 +0,0 @@
-"use strict"
-
-var o = require("../../ospec/ospec")
-var renderService = require("../../render/render")
-var callAsync = require("../../test-utils/callAsync")
-var pushStateMock = require("../../test-utils/pushStateMock")
-var domMock = require("../../test-utils/domMock")
-var Router = require("../../router/router")
-
-o.spec("Router.link", function() {
-	void [{protocol: "http:", hostname: "localhost"}, {protocol: "file:", hostname: "/"}].forEach(function(env) {
-		void ["#", "?", "", "#!", "?!", "/foo"].forEach(function(prefix) {
-			o.spec("using prefix `" + prefix + "` starting on " + env.protocol + "//" + env.hostname, function() {
-				var $window, dom, root, router, onRouteChange, onFail, render
-
-				o.beforeEach(function() {
-					$window = pushStateMock(env)
-					dom = domMock()
-					root = dom.document.body
-					router = new Router($window)
-					router.setPrefix(prefix)
-					onRouteChange = o.spy()
-					onFail = o.spy()
-					render = renderService(dom).render
-				})
-
-				o("works", function(done) {
-					var A = {
-						view: function() {
-							return {tag: "a", attrs: {href: "/b", oncreate: router.link}}
-						}
-					}
-					var B = {
-						view: function() {
-							return {tag: "a", attrs: {href: "/a", oncreate: router.link}}
-						}
-					}
-					
-					$window.location.href = prefix + "/a"
-					router.defineRoutes({"/a": {tag: A}, "/b": {tag: B}}, function(component) {
-						render(root, component)
-					})
-										
-					callAsync(function() {
-						var e = dom.document.createEvent("MouseEvents")
-						e.initEvent("click", true, true)
-						root.firstChild.dispatchEvent(e)
-						
-						callAsync(function() {
-							o(router.getPath()).equals("/b")
-							
-							done()
-						})
-					})
-				})
-
-				o("works after update", function(done) {
-					var id = "a"
-					var A = {
-						view: function() {
-							return {tag: "a", attrs: {href: "/" + id, oncreate: router.link}}
-						}
-					}
-					
-					$window.location.href = prefix + "/a"
-					router.defineRoutes({"/a": {tag: A}, "/b": {tag: A}}, function(component) {
-						render(root, {tag: A})
-						id = "b"
-						render(root, {tag: A})
-					})
-										
-					callAsync(function() {
-						var e = dom.document.createEvent("MouseEvents")
-						e.initEvent("click", true, true)
-						root.firstChild.dispatchEvent(e)
-						
-						callAsync(function() {
-							o(router.getPath()).equals("/b")
-							
-							done()
-						})
-					})
-				})
-			})
-		})
-	})
-})
diff --git a/router/tests/test-setPath.js b/router/tests/test-setPath.js
index 6b817cfb..c957a59a 100644
--- a/router/tests/test-setPath.js
+++ b/router/tests/test-setPath.js
@@ -14,7 +14,7 @@ o.spec("Router.setPath", function() {
 				o.beforeEach(function() {
 					$window = pushStateMock(env)
 					router = new Router($window)
-					router.setPrefix(prefix)
+					router.prefix = prefix
 					onRouteChange = o.spy()
 					onFail = o.spy()
 				})
@@ -88,7 +88,7 @@ o.spec("Router.setPath", function() {
 					$window.location.href = "file://" + prefix + "/test"
 
 					router = new Router($window)
-					router.setPrefix(prefix)
+					router.prefix = prefix
 
 					router.defineRoutes({"/test": {data: 1}, "/other/:a/:b...": {data: 2}}, onRouteChange, onFail)