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

fix bug when mixing keyed and unkeyed elements

Browse source
This commit is contained in:
Leo Horie 2014-09-15 15:53:52 -04:00
parent 6949676e4f
commit 5a134ecf5b
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mithril.js
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("dummy")})
}
}
var actions = Object.keys(existing).map(function(key) {return existing[key]})
@ -131,7 +131,7 @@ Mithril = m = new function app(window, undefined) {
newCached.splice(change.index, 1)
}
if (change.action == INSERTION) {
var dummy = window.document.createElement("div")
var dummy = window.document.createElement("dummy2")
dummy.key = data[change.index].attrs.key
parentElement.insertBefore(dummy, parentElement.childNodes[change.index])
newCached.splice(change.index, 0, {attrs: {key: data[change.index].attrs.key}, nodes: [dummy]})

11
tests/mithril-tests.js
View file

@ -584,6 +584,17 @@ function testMithril(mock) {
var fifthAfter = root.childNodes[1]
return firstBefore === firstAfter && secondBefore === secondAfter && thirdBefore === thirdAfter && fourthBefore === fourthAfter && fifthBefore === fifthAfter
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/246
//insert at beginning with non-keyed in the middle
var root = mock.document.createElement("div")
m.render(root, [m("a", {key: 1})])
var firstBefore = root.childNodes[0]
m.render(root, [m("a", {key: 2}), m("br"), m("a", {key: 1})])
var firstAfter = root.childNodes[2]
console.log(root.childNodes)
return firstBefore == firstAfter && root.childNodes[0].key == 2 && root.childNodes.length == 3
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/134
var root = mock.document.createElement("div")

6
tests/mock.js
View file

@ -15,7 +15,11 @@ mock.window = new function() {
insertBefore: function(node, reference) {
node.parentNode = this
var referenceIndex = this.childNodes.indexOf(reference)
if (referenceIndex < 0) this.childNodes.push(node)
if (referenceIndex < 0) {
var index = this.childNodes.indexOf(node)
if (index > -1) this.childNodes.splice(index, 1)
this.childNodes.push(node)
}
else {
var index = this.childNodes.indexOf(node)
if (index > -1) this.childNodes.splice(index, 1)