diff --git a/mithril.js b/mithril.js index 4974e591..47c10332 100644 --- a/mithril.js +++ b/mithril.js @@ -72,6 +72,12 @@ function hyperscript(selector) { if (typeof selector === "string") return selectorCache[selector](attrs || {}, Vnode.normalizeChildren(children)) return Vnode(selector, attrs && attrs.key, attrs || {}, Vnode.normalizeChildren(children), undefined, undefined) } +hyperscript.trust = function(html) { + return Vnode("<", undefined, undefined, html, undefined, undefined) +} +hyperscript.fragment = function(attrs, children) { + return Vnode("[", attrs.key, attrs, Vnode.normalizeChildren(children), undefined, undefined) +} var m = hyperscript var renderService = function($window) { var $doc = $window.document @@ -1136,9 +1142,6 @@ m.mount = function(renderer, pubsub) { run() } }(renderService, redrawService) -m.trust = function(html) { - return Vnode("<", undefined, undefined, html, undefined, undefined) -} m.withAttr = function(attrName, callback, context) { return function(e) { return callback.call(context || this, attrName in e.currentTarget ? e.currentTarget[attrName] : e.currentTarget.getAttribute(attrName)) diff --git a/mithril.min.js b/mithril.min.js index 108951f9..2512a235 100644 --- a/mithril.min.js +++ b/mithril.min.js @@ -1,41 +1,41 @@ -new function(){function u(b,d,r,g,n,k){return{tag:b,key:d,attrs:r,children:g,text:n,dom:k,domSize:void 0,state:{},events:void 0,instance:void 0,skip:!1}}u.normalize=function(b){return b instanceof Array?u("[",void 0,void 0,u.normalizeChildren(b),void 0,void 0):null!=b&&"object"!==typeof b?u("#",void 0,void 0,b,void 0,void 0):b};u.normalizeChildren=function(b){for(var d=0;d=t&&A>=B;){var h=a[t],v=f[B];if(h===v)t++,B++;else if(null!=h&&null!=v&&h.key===v.key)t++,B++,k(c,h,v,e,l(a,t,b),q,p),q&&h.tag===v.tag&&w(c,m(h),b);else if(h=a[g],h===v)g--,B++;else if(null!=h&&null!=v&&h.key===v.key)k(c,h,v,e,l(a,g+1,b),q,p),B=t&&A>=B;){h=a[g];v=f[A];if(h===v)g--;else if(null!=h&&null!=v&&h.key===v.key)k(c,h,v,e,l(a,g+1,b),q,p),q&&h.tag===v.tag&&w(c,m(h),b), -null!=h.dom&&(b=h.dom),g--;else{if(!n){n=a;var h=g,x={},u;for(u=0;ub.indexOf("?")?"?":"&";b+=p+g}return b}function n(b){try{return""!==b?JSON.parse(b):null}catch(d){throw Error(b);}}function k(b){return b.responseText}function m(b,d){if("function"===typeof b)if(d instanceof Array)for(var g=0;gp.status)d(m(e.type, -b));else{var g=Error(p.responseText),h;for(h in b)g[h]=b[h];d.error(g)}}catch(w){d.error(w)}"function"===typeof y&&y()}};h?p.send(e.data):p.send();return d},jsonp:function(e){var d=l();void 0!==e.initialValue&&d(e.initialValue);var h=e.callbackName||"_mithril_"+Math.round(1E16*Math.random())+"_"+w++,p=b.document.createElement("script");b[h]=function(g){p.parentNode.removeChild(p);d(m(e.type,g));"function"===typeof y&&y();delete b[h]};p.onerror=function(){p.parentNode.removeChild(p);d.error(Error("JSONP request failed")); -"function"===typeof y&&y();delete b[h]};null==e.data&&(e.data={});e.url=r(e.url,e.data);e.data[e.callbackKey||"callback"]=h;p.src=g(e.url,e.data);b.document.documentElement.appendChild(p);return d},setCompletionCallback:function(b){y=b}}}(window,console.error.bind(console)),D=function(){var b=[];return{subscribe:b.push.bind(b),unsubscribe:function(d){d=b.indexOf(d);-1=r&&A>=B;){var k=a[r],v=f[B];if(k===v)r++,B++;else if(null!=k&&null!=v&&k.key===v.key)r++,B++,h(b,k,v,d,l(a,r,c),p,u),p&&k.tag===v.tag&&w(b,m(k),c);else if(k=a[g],k===v)g--,B++;else if(null!=k&&null!=v&&k.key===v.key)h(b,k,v,d,l(a,g+1,c),p,u),B= +r&&A>=B;){k=a[g];v=f[A];if(k===v)g--;else if(null!=k&&null!=v&&k.key===v.key)h(b,k,v,d,l(a,g+1,c),p,u),p&&k.tag===v.tag&&w(b,m(k),c),null!=k.dom&&(c=k.dom),g--;else{if(!n){n=a;var k=g,t={},y;for(y=0;yc.indexOf("?")?"?":"&";c+=g+e}return c}function n(c){try{return""!==c?JSON.parse(c):null}catch(d){throw Error(c);}}function h(c){return c.responseText}function m(c,d){if("function"=== +typeof c)if(d instanceof Array)for(var e=0;eu.status)e(m(c.type,d));else{var g=Error(u.responseText),k;for(k in d)g[k]=d[k];e.error(g)}}catch(w){e.error(w)}"function"===typeof z&&z()}};k?u.send(c.data):u.send();return e},jsonp:function(c){var e=l();void 0!==c.initialValue&&e(c.initialValue);var k=c.callbackName||"_mithril_"+Math.round(1E16*Math.random())+"_"+w++,h=d.document.createElement("script");d[k]=function(g){h.parentNode.removeChild(h); +e(m(c.type,g));"function"===typeof z&&z();delete d[k]};h.onerror=function(){h.parentNode.removeChild(h);e.error(Error("JSONP request failed"));"function"===typeof z&&z();delete d[k]};null==c.data&&(c.data={});c.url=q(c.url,c.data);c.data[c.callbackKey||"callback"]=k;h.src=g(c.url,c.data);d.document.documentElement.appendChild(h);return e},setCompletionCallback:function(c){z=c}}}(window,console.error.bind(console)),C=function(){var d=[];return{subscribe:d.push.bind(d),unsubscribe:function(e){e=d.indexOf(e); +-1