Merge branch 'next' into es6-promise

Conflicts:
	docs/mithril.deferred.md
This commit is contained in:
Leo Horie 2014-09-15 21:32:39 -04:00
commit fe17009bc9
6 changed files with 21 additions and 5 deletions

View file

@ -118,7 +118,7 @@ Mithril = m = new function app(window, undefined) {
if (!existing[key]) existing[key] = {action: INSERTION, index: i}
else existing[key] = {action: MOVE, index: i, from: existing[key].index, element: parentElement.childNodes[existing[key].index]}
}
else unkeyed.push({index: i, element: parentElement.childNodes[i]})
else unkeyed.push({index: i, element: parentElement.childNodes[i] || window.document.createElement("div")})
}
}
var actions = Object.keys(existing).map(function(key) {return existing[key]})