vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Leo Horie 2016-08-26 00:56:18 -04:00
commit e0ee794126
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/lifecycle-methods.md
View file

@ -14,7 +14,7 @@
### Usage ### Usage
[Components](components.md) and [virtual DOM nodes](vnodes.md) and can have lifecycle methods, also known as *hooks*, which are called at various points during the lifetime of a DOM element. [Components](components.md) and [virtual DOM nodes](vnodes.md) can have lifecycle methods, also known as *hooks*, which are called at various points during the lifetime of a DOM element.
```javascript ```javascript
// Sample hook in component // Sample hook in component

2
docs/route.md
View file

@ -266,7 +266,7 @@ m.route.prefix("/my-app")
### Advanced component resolution ### Advanced component resolution
Instead of mapping a component to a route, you can specify a RouteResolver object. A RouteResolver object contains a `onmatch()` method and a optionally a `view()` method. Instead of mapping a component to a route, you can specify a RouteResolver object. A RouteResolver object contains a `onmatch()` method and a optionally a `render()` method.
```javascript ```javascript
m.route(document.body, "/", { m.route(document.body, "/", {