diff --git a/api/router.js b/api/router.js index 91f4eade..96ad71bc 100644 --- a/api/router.js +++ b/api/router.js @@ -16,7 +16,7 @@ module.exports = function($window, redrawService) { render() } var render = function() { - redrawService.render(root, current.resolver.render(Vnode(current.component, current.params.key, current.params))) + if (current.resolver != null) redrawService.render(root, current.resolver.render(Vnode(current.component, current.params.key, current.params))) } routeService.defineRoutes(routes, function(component, params, path) { if (component.view) update({}, component, params, path) diff --git a/mithril.js b/mithril.js index 75a366ce..35531c81 100644 --- a/mithril.js +++ b/mithril.js @@ -1101,9 +1101,9 @@ var _20 = function($window, redrawService0) { render1() } var render1 = function() { - redrawService0.render(root, current.resolver.render(Vnode(current.component, current.params.key, current.params))) + if (current.resolver != null) redrawService0.render(root, current.resolver.render(Vnode(current.component, current.params.key, current.params))) } - routeService.defineRoutes(routes, function(component, params, path, route) { + routeService.defineRoutes(routes, function(component, params, path) { if (component.view) update({}, component, params, path) else { if (component.onmatch) { diff --git a/mithril.min.js b/mithril.min.js index 011140f3..dd7f0936 100644 --- a/mithril.min.js +++ b/mithril.min.js @@ -1,41 +1,41 @@ -new function(){function m(a,c,k,g,d,f){return{tag:a,key:c,attrs:k,children:g,text:d,dom:f,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===I[a]){for(var c,k,g=[],d={};c=O.exec(a);){var f=c[1],n=c[2];""===f&&""!==n?k=n:"#"===f?d.id=n:"."===f?g.push(n):"["===c[3][0]&&((f=c[6])&&(f=f.replace(/\\(["'])/g,"$1").replace(/\\\\/g,"\\")), -"class"===c[4]?g.push(f):d[c[4]]=f||!0)}0b.indexOf("?")?"?":"&";b+=d+c}return b}function n(b){try{return""!==b?JSON.parse(b):null}catch(B){throw Error(b);}}function r(b){return b.responseText}function q(b,a){if("function"=== -typeof b)if(a instanceof Array)for(var c=0;ch.status||304===h.status)c(q(b.type,a));else{var d=Error(h.responseText),f;for(f in a)d[f]=a[f];g(d)}}catch(E){g(E)}};k&&null!=b.data?h.send(b.data):h.send()});return!0===b.background?u:v(u)},jsonp:function(b,h){var n=k();b=g(b,h);var u=new c(function(c,g){var h=b.callbackName|| -"_mithril_"+Math.round(1E16*Math.random())+"_"+m++,k=a.document.createElement("script");a[h]=function(d){k.parentNode.removeChild(k);c(q(b.type,d));delete a[h]};k.onerror=function(){k.parentNode.removeChild(k);g(Error("JSONP request failed"));delete a[h]};null==b.data&&(b.data={});b.url=d(b.url,b.data);b.data[b.callbackKey||"callback"]=h;k.src=f(b.url,b.data);a.document.documentElement.appendChild(k)});return!0===b.background?u:n(u)},setCompletionCallback:function(a){h=a}}}(window,"undefined"!==typeof Promise? -Promise:t),N=function(a){function c(e,l,a,b,c,d,f){for(;a=w&&v>=u;){var x=l[w],m=a[u];if(x!==m||p)if(null==x)w++;else if(null==m)u++;else if(x.key===m.key)w++,u++,f(e,x,m,b,r(l,w,d),p,g),p&&x.tag===m.tag&&q(e,n(x),d);else if(x=l[y],x!==m||p)if(null==x)y--;else if(null==m)u++;else if(x.key===m.key)f(e,x,m,b,r(l,y+1,d),p,g),(p||u=w&&v>=u;){x=l[y];m=a[v];if(x!==m||p)if(null==x)y--;else{if(null!= -m)if(x.key===m.key)f(e,x,m,b,r(l,y+1,d),p,g),p&&x.tag===m.tag&&q(e,n(x),d),null!=x.dom&&(d=x.dom),y--;else{if(!F){F=l;var x=y,B={},C;for(C=0;Cb.indexOf("?")?"?":"&";b+=d+c}return b}function n(b){try{return""!==b?JSON.parse(b):null}catch(B){throw Error(b);}}function r(b){return b.responseText}function q(b,a){if("function"=== +typeof b)if(a instanceof Array)for(var c=0;cl.status||304===l.status)c(q(b.type,a));else{var d=Error(l.responseText),f;for(f in a)d[f]=a[f];g(d)}}catch(D){g(D)}};h&&null!=b.data?l.send(b.data):l.send()});return!0===b.background?t:v(t)},jsonp:function(b,l){var n=h();b=g(b,l);var t=new c(function(c,g){var l=b.callbackName|| +"_mithril_"+Math.round(1E16*Math.random())+"_"+m++,h=a.document.createElement("script");a[l]=function(d){h.parentNode.removeChild(h);c(q(b.type,d));delete a[l]};h.onerror=function(){h.parentNode.removeChild(h);g(Error("JSONP request failed"));delete a[l]};null==b.data&&(b.data={});b.url=d(b.url,b.data);b.data[b.callbackKey||"callback"]=l;h.src=f(b.url,b.data);a.document.documentElement.appendChild(h)});return!0===b.background?t:n(t)},setCompletionCallback:function(a){l=a}}}(window,"undefined"!==typeof Promise? +Promise:u),N=function(a){function c(e,k,a,b,c,d,f){for(;a=w&&v>=t;){var x=k[w],m=a[t];if(x!==m||p)if(null==x)w++;else if(null==m)t++;else if(x.key===m.key)w++,t++,f(e,x,m,b,r(k,w,d),p,g),p&&x.tag===m.tag&&q(e,n(x),d);else if(x=k[z],x!==m||p)if(null==x)z--;else if(null==m)t++;else if(x.key===m.key)f(e,x,m,b,r(k,z+1,d),p,g),(p||t=w&&v>=t;){x=k[z];m=a[v];if(x!==m||p)if(null==x)z--;else{if(null!= +m)if(x.key===m.key)f(e,x,m,b,r(k,z+1,d),p,g),p&&x.tag===m.tag&&q(e,n(x),d),null!=x.dom&&(d=x.dom),z--;else{if(!E){E=k;var x=z,B={},u;for(u=0;u