vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/rewrite' into rewrite

Browse source 
# Conflicts:
#	mithril.min.js
This commit is contained in:
Leo Horie 2016-12-01 01:50:12 -05:00
commit 9f6a1086e4
10 changed files with 166 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mithril.js
View file

@ -452,7 +452,6 @@ var coreRenderer = function($window) {
else {
var recycling = isRecyclable(old, vnodes)
if (recycling) old = old.concat(old.pool)
var oldStart = 0, start = 0, oldEnd = old.length - 1, end = vnodes.length - 1, map
while (oldEnd >= oldStart && end >= start) {
var o = old[oldStart], v = vnodes[start]
@ -662,7 +661,7 @@ var coreRenderer = function($window) {
var content = children[0].children
if (vnode.dom.innerHTML !== content) vnode.dom.innerHTML = content
}
else if (children != null || vnode.text != null) throw new Error("Child node of a contenteditable must be trusted")
else if (vnode.text != null || children != null && children.length !== 0) throw new Error("Child node of a contenteditable must be trusted")
}
//remove
function removeNodes(vnodes, start, end, context) {