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

This commit is contained in:
Leo Horie 2014-03-20 11:24:41 -04:00
commit bebe5ce325
2 changed files with 3 additions and 3 deletions

View file

@ -194,7 +194,7 @@ VirtualElement m(String selector [, Attributes attributes] [, Children children]
where:
VirtualElement :: Object { String tag, Attributes attributes, Children children }
Attributes :: Object<any | void config(DOMElement element, Boolean isNew)>
Attributes :: Object<any | void config(DOMElement element, Boolean isInitialized)>
Children :: String text | Array<String text | VirtualElement virtualElement | Children children>
```
@ -256,7 +256,7 @@ where:
- #### The `config` attribute
**void config(DOMElement element, Boolean isNew)** (optional)
**void config(DOMElement element, Boolean isInitialized)** (optional)
You can define a non-HTML-standard attribute called `config`. This special parameter allows you to call methods on the DOM element after it gets created.

View file

@ -213,7 +213,7 @@ See [`m()`](mithril.md) for more information on virtual elements.
[How to read signatures](how-to-read-signatures.md)
```clike
void route(DOMElement element, Boolean isNew)
void route(DOMElement element, Boolean isInitialized)
```
- **DOMElement element**