Merge branch 'commonjs'

Conflicts:
	archive/v0.1.2/mithril.min.js
	archive/v0.1.2/mithril.min.map
	archive/v0.1.2/mithril.min.zip
This commit is contained in:
Leo Horie 2014-04-01 22:22:31 -04:00
commit 34482a0b0f
10 changed files with 51 additions and 2 deletions

View file

@ -418,6 +418,9 @@ new function(window) {
}
}
if (typeof module != "undefined" && module !== null) module.exports = m
if (typeof define == "function" && define.amd) define(function() {return m})
//testing API
m.deps = function(mock) {return window = mock}
}(this)