Skip to content

Commit

Permalink
Merge pull request facebook#89 from vjeux/patch-4
Browse files Browse the repository at this point in the history
Exposing ReactProps as React.Props
  • Loading branch information
yungsters committed Jun 14, 2013
2 parents 48f46b5 + 3417363 commit 80edd6c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/core/React.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ var ReactCompositeComponent = require('ReactCompositeComponent');
var ReactComponent = require('ReactComponent');
var ReactDOM = require('ReactDOM');
var ReactMount = require('ReactMount');
var ReactProps = require('ReactProps');
var ReactServerRendering = require('ReactServerRendering');

var ReactDefaultInjection = require('ReactDefaultInjection');
Expand All @@ -30,6 +31,7 @@ ReactDefaultInjection.inject();

var React = {
DOM: ReactDOM,
Props: ReactProps,
initializeTouchEvents: function(shouldUseTouch) {
ReactMount.useTouchEvents = shouldUseTouch;
},
Expand Down

0 comments on commit 80edd6c

Please sign in to comment.