Merge branch 'components' of https://github.com/pelonpelon/mithril.js into pelonpelon-components

Conflicts:
	docs/mithril.module.md
This commit is contained in:
Leo Horie 2015-03-06 17:13:47 -05:00
commit 57c199e2c6
3 changed files with 5 additions and 5 deletions

View file

@ -168,7 +168,7 @@ var log = function(value) {
}
var users = m.request({method: "GET", url: "/user"})
.then(log);
.then(log)
.then(function(users) {
//add one more user to the response
return users.concat({name: "Jane"})
@ -338,7 +338,7 @@ You can read more about the [promise exception monitor here](mithril.deferred.md
The `config` option can be used to arbitrarily configure the native XMLHttpRequest instance and to access properties that would not be accessible otherwise.
The example below show how to configure a request where the server expects requests to have a `Content-Type: application/json` header
The example below shows how to configure a request where the server expects requests to have a `Content-Type: application/json` header
```javascript
var xhrConfig = function(xhr) {