Skip to content

Commit

Permalink
Merge pull request #4 from adri/vanilla-node-compatibility
Browse files Browse the repository at this point in the history
Replaces syntax to be compatible with vanilla node.
  • Loading branch information
ericclemmons committed Feb 24, 2015
2 parents 285c071 + d84b51a commit 8f10706
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions lib/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ var React = require('react');
var Router = require('react-router');
var mixin = require('./mixin');

var { Route, RouteHandler } = Router;
var Route = Router.Route;
var RouteHandler = Router.RouteHandler;

var Resolver = function(context) {
this.promises = {};
Expand All @@ -28,21 +29,19 @@ Resolver.prototype.route = function(routes) {
},

render: function() {
return <RouteHandler />;
return React.createElement(RouteHandler);
}
});

return (
<Route handler={ResolverContext}>
{routes}
</Route>
);
return React.createElement(Route, {handler: ResolverContext}, routes);
};

Resolver.prototype.resolve = function(element) {
React.renderToStaticMarkup(element);

var pending = _.any(this.promises, (promise) => promise.isPending());
var pending = _.any(this.promises, function (promise) {
return promise.isPending();
});

// Because the first render is hidden, a minimum of 1 resolution is required
if (pending || !this.renders++) {
Expand All @@ -55,7 +54,7 @@ Resolver.prototype.resolve = function(element) {
};

Resolver.prototype.handle = function(Component) {
return this.resolve(<Component />);
return this.resolve(React.createElement(Component));
};

module.exports = Resolver;

0 comments on commit 8f10706

Please sign in to comment.