Skip to content

Commit

Permalink
Fixed error condition
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanoneill committed Jun 3, 2015
1 parent 23f5ac0 commit f03a4e0
Showing 1 changed file with 20 additions and 13 deletions.
33 changes: 20 additions & 13 deletions app.js
Expand Up @@ -7,7 +7,6 @@ var Iso = require('iso');

var routes = require('./src/routes');
var alt = require('./src/alt');
var twitterApi = require('./src/twitter-api');

var buildBootstrapData = function (handler, data) {
var storeData = {};
Expand All @@ -18,23 +17,31 @@ var buildBootstrapData = function (handler, data) {
};

var getPageHandler = function (state) {
return state.routes[1].handler; // 0 is the root
if (state.routes.length >= 2) {
return state.routes[1].handler; // 0 is the root
} else {
return undefined;
}
};

var server = http.createServer(function (request, response) {
Router.run(routes, request.url, function (Handler, state) {
var handler = getPageHandler(state);
handler.fetchData(state.params).then(function (data) {
alt.bootstrap(buildBootstrapData(handler, data));
var content = React.renderToString(React.createElement(Handler));

var iso = new Iso();
iso.add(content, alt.flush());

response.end(iso.render());
}).catch(function () {
response.end('error occurred');
});
if (handler) {
handler.fetchData(state.params).then(function (data) {
alt.bootstrap(buildBootstrapData(handler, data));
var content = React.renderToString(React.createElement(Handler));

var iso = new Iso();
iso.add(content, alt.flush());

response.end(iso.render());
}).catch(function () {
response.end('error occurred');
});
} else {
response.end('unknown route');
}
});
});

Expand Down

0 comments on commit f03a4e0

Please sign in to comment.