Merge remote-tracking branch 'origin/rewrite' into rewrite
This commit is contained in:
commit
e0ee794126
2 changed files with 2 additions and 2 deletions
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
### 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
|
||||
// Sample hook in component
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ m.route.prefix("/my-app")
|
|||
|
||||
### 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
|
||||
m.route(document.body, "/", {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue