Merge branch 'cody-when'

Author: mjackson

.jshintrc

@@ -1,6 +1,7 @@
 {
+  "asi": true,
   "eqnull": true,
   "esnext": true,
   "unused": "vars",
   "predef": [ "-Promise" ]
-}
+}

examples/async-data/app.js

@@ -1,6 +1,5 @@
 var React = require('react');
 var Router = require('react-router');
-var whenKeys = require('when/keys');
 var EventEmitter = require('events').EventEmitter;
 var { Route, DefaultRoute, RouteHandler, Link } = Router;
 
@@ -120,12 +119,13 @@ var routes = (
 );
 
 function fetchData(routes, params) {
-  return whenKeys.all(routes.filter((route) => {
-    return route.handler.fetchData;
-  }).reduce((data, route) => {
-    data[route.name] = route.handler.fetchData(params);
-    return data;
-  }, {}));
+  var data = {};
+  return Promise.all(routes
+    .filter(route => route.handler.fetchData)
+    .map(route => {
+      return route.handler.fetchData(params).then(d => {data[route.name] = d;});
+    })
+  ).then(() => data);
 }
 
 Router.run(routes, function (Handler, state) {