Merge branch 'next' into es6-promise

Conflicts:
	docs/mithril.deferred.md
This commit is contained in:
Leo Horie 2014-09-15 21:32:39 -04:00
commit fe17009bc9
6 changed files with 21 additions and 5 deletions

View file

@ -119,7 +119,7 @@ var greetAsync = function() {
### Differences from Promises/A+
For the most part, Mithril promises behave as you'd expect a [Promise/A+](http://promises-aplus.github.io/promises-spec/) promise to behave, but they have a few differences.
For the most part, Mithril promises behave as you'd expect a [Promise/A+](http://promises-aplus.github.io/promises-spec/) promise to behave, but have one difference: Mithril promises attempt to execute synchronously if possible.
#### Synchronous execution