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

@ -295,7 +295,7 @@ describe("m.deferred()", function () {
prmA.promise.then(function (A) {
return prmB.promise
}).then(function(B) {
}).then(function (B) {
expect(B).to.equal("B")
})
})
@ -303,7 +303,7 @@ describe("m.deferred()", function () {
var d = m.deferred()
d.resolve(5)
d.resolve(6)
d.promise.then(function(v) {
d.promise.then(function (v) {
expect(v).to.equal(5)
})
})