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

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

Browse source
This commit is contained in:
Leo Horie 2016-04-20 00:36:48 -04:00
commit f226d56481
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mithril.js
View file

@ -10,7 +10,7 @@
global.m = m global.m = m
} }
/* eslint-enable no-undef */ /* eslint-enable no-undef */
})(typeof window !== "undefined" ? window : {}, function (global, undefined) { // eslint-disable-line })(typeof window !== "undefined" ? window : this, function (global, undefined) { // eslint-disable-line
"use strict" "use strict"
m.version = function () { m.version = function () {

2
test/mithril.trust.js
View file

@ -41,7 +41,7 @@ describe("m.trust()", function () {
expect(root.childNodes[3].tagName).to.equal("I") expect(root.childNodes[3].tagName).to.equal("I")
}) })
// TODO: this currently fails. // TODO: m.trust's contents are having their tags stripped.
xit("works with mixed trusted content in td", function () { xit("works with mixed trusted content in td", function () {
var root = document.createElement("table") var root = document.createElement("table")
root.appendChild(root = document.createElement("tr")) root.appendChild(root = document.createElement("tr"))