Merge branch 'lint' of https://github.com/isiahmeadows/mithril.js into isiahmeadows-lint

Conflicts:
	mithril.js
	tests/mithril-tests.js
This commit is contained in:
Leo Horie 2016-01-28 18:40:19 -05:00
commit 4f0d479ee7
17 changed files with 4783 additions and 2997 deletions

View file

@ -56,13 +56,13 @@ describe("m.trust()", function () {
it("works with trusted content in div", function () {
var root = document.createElement("div")
m.render(root, m('div', [
m('p', '©'),
m('p', m.trust('©')),
m.trust('©'),
m.render(root, m("div", [
m("p", "©"),
m("p", m.trust("©")),
m.trust("©"),
]))
expect(root.innerHTML).to.equal("<div><p>&amp;copy;</p><p>©</p>©</div>")
})
})
})