Merge branch 'master' of https://github.com/lhorie/mithril.js into next

This commit is contained in:
impinball 2016-01-22 08:13:53 -05:00
commit 90aa355795

View file

@ -327,12 +327,12 @@ var ctrl = new TemperatureConverter.controller();
assert(ctrl.kelvinToCelsius(273.15) == 0) assert(ctrl.kelvinToCelsius(273.15) == 0)
//test the template //test the template
var tpl = TemperatureConverter.view(null, {value: 273.15}) var tpl = TemperatureConverter.view(ctrl, {value: 273.15})
assert(tpl.children[1] == 0) assert(tpl.children[1] == 0)
//test with real DOM //test with real DOM
var testRoot = document.createElement("div") var testRoot = document.createElement("div")
m.render(testRoot, TemperatureConverter.view(null, {value: 273.15})) m.render(testRoot, TemperatureConverter.view(ctrl, {value: 273.15}))
assert(testRoot.innerHTML.indexOf("celsius:0") > -1) assert(testRoot.innerHTML.indexOf("celsius:0") > -1)
``` ```
@ -603,4 +603,3 @@ where:
- **returns Component parameterizedComponent** - **returns Component parameterizedComponent**
A component with arguments bound A component with arguments bound