Merge remote-tracking branch 'origin/next' into components
This commit is contained in:
commit
1586d8aaa1
2 changed files with 7 additions and 1 deletions
|
|
@ -174,7 +174,7 @@ var m = (function app(window, undefined) {
|
||||||
for (var prop in existing) actions.push(existing[prop])
|
for (var prop in existing) actions.push(existing[prop])
|
||||||
var changes = actions.sort(sortChanges);
|
var changes = actions.sort(sortChanges);
|
||||||
var newCached = new Array(cached.length)
|
var newCached = new Array(cached.length)
|
||||||
newCached.nodes = []
|
newCached.nodes = cached.nodes.slice()
|
||||||
|
|
||||||
for (var i = 0, change; change = changes[i]; i++) {
|
for (var i = 0, change; change = changes[i]; i++) {
|
||||||
if (change.action === DELETION) {
|
if (change.action === DELETION) {
|
||||||
|
|
|
||||||
|
|
@ -1681,6 +1681,12 @@ function testMithril(mock) {
|
||||||
m.render(root, m("div", function() {}))
|
m.render(root, m("div", function() {}))
|
||||||
return root.childNodes[0].childNodes.length == 0
|
return root.childNodes[0].childNodes.length == 0
|
||||||
})
|
})
|
||||||
|
test(function() {
|
||||||
|
var root = mock.document.createElement("div")
|
||||||
|
m.render(root, m("div", "foo", m("a")))
|
||||||
|
m.render(root, m("div", "test"))
|
||||||
|
return root.childNodes[0].childNodes.length == 1
|
||||||
|
})
|
||||||
//end m.render
|
//end m.render
|
||||||
|
|
||||||
//m.redraw
|
//m.redraw
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue