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

Conflicts:
	mithril.js
	tests/e2e/tests.js
This commit is contained in:
Leo Horie 2014-06-03 23:27:19 -04:00
commit 4020933780
2 changed files with 33 additions and 2 deletions

View file

@ -45,6 +45,7 @@ test('issue99 regression', function() {
m.render(dummyEl, view2);
equal(dummyEl.innerHTML, '<div><span>0</span></div>', 'view2 should be rendered correctly');
});
test('config handler context', function() {
expect(3);
var view = m('div', {config: function(evt, isInitialized, context){
@ -58,4 +59,4 @@ test('config handler context', function() {
equal(context.data, 1);
}})
m.render(dummyEl, view);
})
})