From 86ba3474a638a314ae9a98d568f0849b90c97e6e Mon Sep 17 00:00:00 2001 From: Leo Horie Date: Sun, 30 Mar 2014 22:33:49 -0400 Subject: [PATCH 1/3] add tentative fix for #29 https://github.com/lhorie/mithril.js/issues/29 TODO: test cost of relying on native equality checks --- archive/v0.1.2/mithril-tests.js | 5 +++-- archive/v0.1.2/mithril.min.js | 2 +- archive/v0.1.2/mithril.min.map | 2 +- archive/v0.1.2/mithril.min.zip | Bin 20069 -> 19997 bytes mithril.js | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/archive/v0.1.2/mithril-tests.js b/archive/v0.1.2/mithril-tests.js index 9bec759a..9d285e27 100644 --- a/archive/v0.1.2/mithril-tests.js +++ b/archive/v0.1.2/mithril-tests.js @@ -119,14 +119,14 @@ new function(window) { function setAttributes(node, dataAttrs, cachedAttrs) { for (var attrName in dataAttrs) { var dataAttr = dataAttrs[attrName] - if (!(attrName in cachedAttrs) || (cachedAttrs[attrName] !== dataAttr)) { + //if (!(attrName in cachedAttrs) || (cachedAttrs[attrName] !== dataAttr)) { cachedAttrs[attrName] = dataAttr if (attrName == "config") continue if (attrName.indexOf("on") == 0 && typeof dataAttr == "function") dataAttr = autoredraw(dataAttr, node) if (attrName == "style") for (var rule in dataAttr) node.style[rule] = dataAttr[rule] else if (attrName in node) node[attrName] = dataAttr else node.setAttribute(attrName, dataAttr) - } + //} } return cachedAttrs } @@ -180,6 +180,7 @@ new function(window) { var currentRoot, currentModule = {view: function() {}}, currentController = {}, now = 0, lastRedraw = 0, lastRedrawId = 0 m.module = function(root, module) { m.startComputation() + cellCache = {} currentRoot = root currentModule = module currentController = new module.controller diff --git a/archive/v0.1.2/mithril.min.js b/archive/v0.1.2/mithril.min.js index de690171..d8aec9c9 100644 --- a/archive/v0.1.2/mithril.min.js +++ b/archive/v0.1.2/mithril.min.js @@ -4,5 +4,5 @@ http://github.com/lhorie/mithril.js (c) Leo Horie License: MIT */ -!new function(a){function b(e,f,g){if(null!==f&&void 0!==f){var h=s.call(g),i=s.call(f);if(h!=i&&(null!==g&&void 0!==g&&d(g.nodes),g=new f.constructor,g.nodes=[]),"[object Array]"==i){for(var j=[],k=g.length===f.length,l=0;l-1?new f.constructor(f):f,g.nodes=[n]}else if(g.valueOf()!==f.valueOf()){if(f.$trusted){var q=g.nodes[0],j=[q];if(q){for(;q=q.nextSibling;)j.push(q);d(j);var p=e.lastChild;e.insertAdjacentHTML("beforeend",f),n=p?p.nextSibling:e.firstChild}else e.innerHTML=f}else n=g.nodes[0],e.appendChild(n),n.nodeValue=f;g=new f.constructor(f),g.nodes=[n]}else g.nodes.intact=!0}return g}}function c(a,b,c){for(var d in b){var e=b[d];if(!(d in c)||c[d]!==e){if(c[d]=e,"config"==d)continue;if(0==d.indexOf("on")&&"function"==typeof e&&(e=f(e,a)),"style"==d)for(var g in e)a.style[g]=e[g];else d in a?a[d]=e:a.setAttribute(d,e)}}return c}function d(a){for(var b=0;b16)m.redraw();else{var b=a.cancelAnimationFrame||a.clearTimeout,c=a.requestAnimationFrame||a.setTimeout;b(E),E=c(m.redraw,0)}}function h(a,b,c){J={};for(var d in b){if(d==c)return!void m.module(a,b[d]);var e=new RegExp("^"+d.replace(/:[^\/]+/g,"([^\\/]+)")+"$");if(e.test(c))return!void c.replace(e,function(){for(var c=d.match(/:[^\/]+/g),e=[].slice.call(arguments,1,-2),f=0;f0&&("GET"==a.method?a.url=a.url+(a.url.indexOf("?")<0?"?":"&")+n(b):a.data=c(b)),a}function p(a,b){var c=a.match(/:\w+/g);if(c&&b)for(var d=0;d0&&(f.attrs[d]=h.join(" "))}f=e(f),f.attrs=e(f.attrs),f.children=b?a[2]:a[1];for(var j in c)f.attrs[j]=j==d?(f.attrs[j]||"")+" "+c[j]:c[j];return f};var v,w={insertAdjacentHTML:function(b,c){a.document.write(c),a.document.close()},appendChild:function(b){void 0===v&&(v=a.document.createElement("html")),"HTML"==b.nodeName?v=b:v.appendChild(b),a.document.documentElement!==v&&a.document.replaceChild(v,a.document.documentElement)}},x=[],y={};m.render=function(c,d){var e=x.indexOf(c),f=0>e?x.push(c)-1:e,g=c==a.document||c==a.document.documentElement?w:c;y[f]=b(g,d,y[f])},m.trust=function(a){return a=new String(a),a.$trusted=!0,a};var z,A={view:function(){}},B={},C=0,D=0,E=0;m.module=function(a,b){m.startComputation(),z=a,A=b,B=new b.controller,m.endComputation()},m.redraw=function(){m.render(z||a.document,A.view(B)),D=C};var F=0,G=null;m.startComputation=function(){F++},m.endComputation=function(){F=Math.max(F-1,0),0==F&&(g(),G&&(G(),G=null))},m.withAttr=function(a,b){return function(c){b(a in c.currentTarget?c.currentTarget[a]:c.currentTarget.getAttribute(a))}};var H={pathname:"",hash:"#",search:"?"},I=function(){},J={};m.route=function(){if(3==arguments.length){var b=arguments[0],c=arguments[1],d=arguments[2];I=function(a){var e=a.slice(H[m.route.mode].length);h(b,d,e)||m.route(c,!0)};var e="hash"==m.route.mode?"onhashchange":"onpopstate";a[e]=function(){I(a.location[m.route.mode])},G=j,a[e]()}else if(arguments[0].addEventListener){var f=arguments[0],g=arguments[1];g||(f.removeEventListener("click",i),f.addEventListener("click",i))}else if("string"==typeof arguments[0]){var k=arguments[0],l=arguments[1]===!0;a.history.pushState?(G=function(){a.history[l?"replaceState":"pushState"](null,a.document.title,H[m.route.mode]+k),j()},I(H[m.route.mode]+k)):a.location[m.route.mode]=k}},m.route.param=function(a){return J[a]},m.route.mode="search",m.prop=function(a){return function(){return arguments.length&&(a=arguments[0]),a}},m.deferred=function(){var a=[],b=[],c={resolve:function(b){for(var c=0;c-1?new f.constructor(f):f,g.nodes=[n]}else if(g.valueOf()!==f.valueOf()){if(f.$trusted){var q=g.nodes[0],j=[q];if(q){for(;q=q.nextSibling;)j.push(q);d(j);var p=e.lastChild;e.insertAdjacentHTML("beforeend",f),n=p?p.nextSibling:e.firstChild}else e.innerHTML=f}else n=g.nodes[0],e.appendChild(n),n.nodeValue=f;g=new f.constructor(f),g.nodes=[n]}else g.nodes.intact=!0}return g}}function c(a,b,c){for(var d in b){var e=b[d];if(c[d]=e,"config"!=d)if(0==d.indexOf("on")&&"function"==typeof e&&(e=f(e,a)),"style"==d)for(var g in e)a.style[g]=e[g];else d in a?a[d]=e:a.setAttribute(d,e)}return c}function d(a){for(var b=0;b16)m.redraw();else{var b=a.cancelAnimationFrame||a.clearTimeout,c=a.requestAnimationFrame||a.setTimeout;b(E),E=c(m.redraw,0)}}function h(a,b,c){J={};for(var d in b){if(d==c)return!void m.module(a,b[d]);var e=new RegExp("^"+d.replace(/:[^\/]+/g,"([^\\/]+)")+"$");if(e.test(c))return!void c.replace(e,function(){for(var c=d.match(/:[^\/]+/g),e=[].slice.call(arguments,1,-2),f=0;f0&&("GET"==a.method?a.url=a.url+(a.url.indexOf("?")<0?"?":"&")+n(b):a.data=c(b)),a}function p(a,b){var c=a.match(/:\w+/g);if(c&&b)for(var d=0;d0&&(f.attrs[d]=h.join(" "))}f=e(f),f.attrs=e(f.attrs),f.children=b?a[2]:a[1];for(var j in c)f.attrs[j]=j==d?(f.attrs[j]||"")+" "+c[j]:c[j];return f};var v,w={insertAdjacentHTML:function(b,c){a.document.write(c),a.document.close()},appendChild:function(b){void 0===v&&(v=a.document.createElement("html")),"HTML"==b.nodeName?v=b:v.appendChild(b),a.document.documentElement!==v&&a.document.replaceChild(v,a.document.documentElement)}},x=[],y={};m.render=function(c,d){var e=x.indexOf(c),f=0>e?x.push(c)-1:e,g=c==a.document||c==a.document.documentElement?w:c;y[f]=b(g,d,y[f])},m.trust=function(a){return a=new String(a),a.$trusted=!0,a};var z,A={view:function(){}},B={},C=0,D=0,E=0;m.module=function(a,b){m.startComputation(),y={},z=a,A=b,B=new b.controller,m.endComputation()},m.redraw=function(){m.render(z||a.document,A.view(B)),D=C};var F=0,G=null;m.startComputation=function(){F++},m.endComputation=function(){F=Math.max(F-1,0),0==F&&(g(),G&&(G(),G=null))},m.withAttr=function(a,b){return function(c){b(a in c.currentTarget?c.currentTarget[a]:c.currentTarget.getAttribute(a))}};var H={pathname:"",hash:"#",search:"?"},I=function(){},J={};m.route=function(){if(3==arguments.length){var b=arguments[0],c=arguments[1],d=arguments[2];I=function(a){var e=a.slice(H[m.route.mode].length);h(b,d,e)||m.route(c,!0)};var e="hash"==m.route.mode?"onhashchange":"onpopstate";a[e]=function(){I(a.location[m.route.mode])},G=j,a[e]()}else if(arguments[0].addEventListener){var f=arguments[0],g=arguments[1];g||(f.removeEventListener("click",i),f.addEventListener("click",i))}else if("string"==typeof arguments[0]){var k=arguments[0],l=arguments[1]===!0;a.history.pushState?(G=function(){a.history[l?"replaceState":"pushState"](null,a.document.title,H[m.route.mode]+k),j()},I(H[m.route.mode]+k)):a.location[m.route.mode]=k}},m.route.param=function(a){return J[a]},m.route.mode="search",m.prop=function(a){return function(){return arguments.length&&(a=arguments[0]),a}},m.deferred=function(){var a=[],b=[],c={resolve:function(b){for(var c=0;c(pkqHOu9Nc2kC@5I!1wnUA=VNCubY%V|3rFW$4SuXtBA%NSA|AfAcb{Y&MQ` scO7p>XGibN!j9*8cv0Lo`Ms~cJgTJ(4E$g}z=+z(wth-%eZC+*0A@Q!4FCWD delta 283 zcmbO`hwJ=u`GbMsF2&)l0g3SZ;o0~vZY z<(wM70RscS!RD#5i9*KCRZcp-j*h;LI-ZV>kuEykj*gj5jykSDjx&gp>o_~Q zmbvP Date: Tue, 1 Apr 2014 16:45:02 -0400 Subject: [PATCH 2/3] use less expensive check for attribute diff qualification --- mithril.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mithril.js b/mithril.js index 7754b9bb..f5cc1020 100644 --- a/mithril.js +++ b/mithril.js @@ -119,14 +119,14 @@ new function(window) { function setAttributes(node, dataAttrs, cachedAttrs) { for (var attrName in dataAttrs) { var dataAttr = dataAttrs[attrName] - //if (!(attrName in cachedAttrs) || (cachedAttrs[attrName] !== dataAttr)) { + if (!(attrName in cachedAttrs) || (cachedAttrs[attrName] !== dataAttr) || node === window.document.activeElement) { cachedAttrs[attrName] = dataAttr if (attrName == "config") continue if (attrName.indexOf("on") == 0 && typeof dataAttr == "function") dataAttr = autoredraw(dataAttr, node) if (attrName == "style") for (var rule in dataAttr) node.style[rule] = dataAttr[rule] else if (attrName in node) node[attrName] = dataAttr else node.setAttribute(attrName, dataAttr) - //} + } } return cachedAttrs } @@ -180,7 +180,6 @@ new function(window) { var currentRoot, currentModule = {view: function() {}}, currentController = {}, now = 0, lastRedraw = 0, lastRedrawId = 0 m.module = function(root, module) { m.startComputation() - cellCache = {} currentRoot = root currentModule = module currentController = new module.controller From 2653dbc648b918e09f1bfc0e0f53e5fd66a4448a Mon Sep 17 00:00:00 2001 From: Leo Horie Date: Tue, 1 Apr 2014 16:45:42 -0400 Subject: [PATCH 3/3] rebuild --- archive/v0.1.2/mithril-tests.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/archive/v0.1.2/mithril-tests.js b/archive/v0.1.2/mithril-tests.js index 9d285e27..9003ecd4 100644 --- a/archive/v0.1.2/mithril-tests.js +++ b/archive/v0.1.2/mithril-tests.js @@ -119,14 +119,14 @@ new function(window) { function setAttributes(node, dataAttrs, cachedAttrs) { for (var attrName in dataAttrs) { var dataAttr = dataAttrs[attrName] - //if (!(attrName in cachedAttrs) || (cachedAttrs[attrName] !== dataAttr)) { + if (!(attrName in cachedAttrs) || (cachedAttrs[attrName] !== dataAttr) || node === window.document.activeElement) { cachedAttrs[attrName] = dataAttr if (attrName == "config") continue if (attrName.indexOf("on") == 0 && typeof dataAttr == "function") dataAttr = autoredraw(dataAttr, node) if (attrName == "style") for (var rule in dataAttr) node.style[rule] = dataAttr[rule] else if (attrName in node) node[attrName] = dataAttr else node.setAttribute(attrName, dataAttr) - //} + } } return cachedAttrs } @@ -180,7 +180,6 @@ new function(window) { var currentRoot, currentModule = {view: function() {}}, currentController = {}, now = 0, lastRedraw = 0, lastRedrawId = 0 m.module = function(root, module) { m.startComputation() - cellCache = {} currentRoot = root currentModule = module currentController = new module.controller