Merge remote-tracking branch 'origin/next' into patch-2

This commit is contained in:
impinball 2015-11-19 18:12:43 -05:00
commit f673306d6c
4 changed files with 7 additions and 8 deletions

View file

@ -1317,7 +1317,7 @@ describe("m.render()", function () {
// FIXME: implement document.createRange().createContextualFragment() in the
// mock document to fix this test
xit("keeps unkeyed identity if mixed with elements/trusted text and identity can be inferred", function () { // eslint-disable-line
it("keeps unkeyed identity if mixed with elements/trusted text and identity can be inferred", function () { // eslint-disable-line
var root = mock.document.createElement("div")
m.render(root, m("div", [