From a209ec504936ea4334e56c43d30ff3a34384f340 Mon Sep 17 00:00:00 2001 From: Stefan Dombrowski Date: Mon, 5 Jan 2015 21:56:00 +0100 Subject: [PATCH] Replace when.js with promises in example app --- examples/async-data/app.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/async-data/app.js b/examples/async-data/app.js index 37319d1f8f..535009f575 100644 --- a/examples/async-data/app.js +++ b/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) {